Browse code
Merge pull request #22955 from crosbymichael/containerd-may24
Bump containerd to 9dc2b3273db42c75368988a3885a3af
Brian Goff authored on 2016/05/28 00:21:40Showing 8 changed files
- Dockerfile
- Dockerfile.aarch64
- Dockerfile.armhf
- Dockerfile.gccgo
- Dockerfile.ppc64le
- Dockerfile.s390x
- Dockerfile.simple
- hack/vendor.sh
| ... | ... |
@@ -258,7 +258,7 @@ RUN set -x \ |
| 258 | 258 |
&& cp runc /usr/local/bin/docker-runc |
| 259 | 259 |
|
| 260 | 260 |
# Install containerd |
| 261 |
-ENV CONTAINERD_COMMIT v0.2.1 |
|
| 261 |
+ENV CONTAINERD_COMMIT 9dc2b3273db42c75368988a3885a3afd770069d9 |
|
| 262 | 262 |
RUN set -x \ |
| 263 | 263 |
&& export GOPATH="$(mktemp -d)" \ |
| 264 | 264 |
&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -191,7 +191,7 @@ RUN set -x \ |
| 191 | 191 |
&& cp runc /usr/local/bin/docker-runc |
| 192 | 192 |
|
| 193 | 193 |
# Install containerd |
| 194 |
-ENV CONTAINERD_COMMIT v0.2.1 |
|
| 194 |
+ENV CONTAINERD_COMMIT 9dc2b3273db42c75368988a3885a3afd770069d9 |
|
| 195 | 195 |
RUN set -x \ |
| 196 | 196 |
&& export GOPATH="$(mktemp -d)" \ |
| 197 | 197 |
&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -210,7 +210,7 @@ RUN set -x \ |
| 210 | 210 |
&& cp runc /usr/local/bin/docker-runc |
| 211 | 211 |
|
| 212 | 212 |
# Install containerd |
| 213 |
-ENV CONTAINERD_COMMIT v0.2.1 |
|
| 213 |
+ENV CONTAINERD_COMMIT 9dc2b3273db42c75368988a3885a3afd770069d9 |
|
| 214 | 214 |
RUN set -x \ |
| 215 | 215 |
&& export GOPATH="$(mktemp -d)" \ |
| 216 | 216 |
&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -84,7 +84,7 @@ RUN set -x \ |
| 84 | 84 |
&& cp runc /usr/local/bin/docker-runc |
| 85 | 85 |
|
| 86 | 86 |
# Install containerd |
| 87 |
-ENV CONTAINERD_COMMIT v0.2.1 |
|
| 87 |
+ENV CONTAINERD_COMMIT 9dc2b3273db42c75368988a3885a3afd770069d9 |
|
| 88 | 88 |
RUN set -x \ |
| 89 | 89 |
&& export GOPATH="$(mktemp -d)" \ |
| 90 | 90 |
&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -209,7 +209,7 @@ RUN set -x \ |
| 209 | 209 |
&& cp runc /usr/local/bin/docker-runc |
| 210 | 210 |
|
| 211 | 211 |
# Install containerd |
| 212 |
-ENV CONTAINERD_COMMIT v0.2.1 |
|
| 212 |
+ENV CONTAINERD_COMMIT 9dc2b3273db42c75368988a3885a3afd770069d9 |
|
| 213 | 213 |
RUN set -x \ |
| 214 | 214 |
&& export GOPATH="$(mktemp -d)" \ |
| 215 | 215 |
&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -188,7 +188,7 @@ RUN set -x \ |
| 188 | 188 |
&& cp runc /usr/local/bin/docker-runc |
| 189 | 189 |
|
| 190 | 190 |
# Install containerd |
| 191 |
-ENV CONTAINERD_COMMIT v0.2.1 |
|
| 191 |
+ENV CONTAINERD_COMMIT 9dc2b3273db42c75368988a3885a3afd770069d9 |
|
| 192 | 192 |
RUN set -x \ |
| 193 | 193 |
&& export GOPATH="$(mktemp -d)" \ |
| 194 | 194 |
&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -40,7 +40,7 @@ RUN set -x \ |
| 40 | 40 |
&& cp runc /usr/local/bin/docker-runc |
| 41 | 41 |
|
| 42 | 42 |
# Install containerd |
| 43 |
-ENV CONTAINERD_COMMIT v0.2.1 |
|
| 43 |
+ENV CONTAINERD_COMMIT 9dc2b3273db42c75368988a3885a3afd770069d9 |
|
| 44 | 44 |
RUN set -x \ |
| 45 | 45 |
&& export GOPATH="$(mktemp -d)" \ |
| 46 | 46 |
&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -90,5 +90,5 @@ clone git google.golang.org/api dc6d2353af16e2a2b0ff6986af051d473a4ed468 https:/ |
| 90 | 90 |
clone git google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0 https://code.googlesource.com/gocloud |
| 91 | 91 |
|
| 92 | 92 |
# containerd |
| 93 |
-clone git github.com/docker/containerd v0.2.1 |
|
| 93 |
+clone git github.com/docker/containerd 9dc2b3273db42c75368988a3885a3afd770069d9 |
|
| 94 | 94 |
clean |