Browse code
Vendor in containerd
This brings in the exec's children handling fixes
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Kenfe-Mickael Laventure authored on 2016/09/24 06:17:44Showing 8 changed files
- Dockerfile
- Dockerfile.aarch64
- Dockerfile.armhf
- Dockerfile.gccgo
- Dockerfile.ppc64le
- Dockerfile.s390x
- Dockerfile.simple
- hack/vendor.sh
| ... | ... |
@@ -253,7 +253,7 @@ RUN set -x \ |
| 253 | 253 |
&& rm -rf "$GOPATH" |
| 254 | 254 |
|
| 255 | 255 |
# Install containerd |
| 256 |
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 |
|
| 256 |
+ENV CONTAINERD_COMMIT v0.2.4 |
|
| 257 | 257 |
RUN set -x \ |
| 258 | 258 |
&& export GOPATH="$(mktemp -d)" \ |
| 259 | 259 |
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -192,7 +192,7 @@ RUN set -x \ |
| 192 | 192 |
&& rm -rf "$GOPATH" |
| 193 | 193 |
|
| 194 | 194 |
# Install containerd |
| 195 |
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 |
|
| 195 |
+ENV CONTAINERD_COMMIT v0.2.4 |
|
| 196 | 196 |
RUN set -x \ |
| 197 | 197 |
&& export GOPATH="$(mktemp -d)" \ |
| 198 | 198 |
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -200,7 +200,7 @@ RUN set -x \ |
| 200 | 200 |
&& rm -rf "$GOPATH" |
| 201 | 201 |
|
| 202 | 202 |
# Install containerd |
| 203 |
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 |
|
| 203 |
+ENV CONTAINERD_COMMIT v0.2.4 |
|
| 204 | 204 |
RUN set -x \ |
| 205 | 205 |
&& export GOPATH="$(mktemp -d)" \ |
| 206 | 206 |
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -85,7 +85,7 @@ RUN set -x \ |
| 85 | 85 |
&& rm -rf "$GOPATH" |
| 86 | 86 |
|
| 87 | 87 |
# Install containerd |
| 88 |
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 |
|
| 88 |
+ENV CONTAINERD_COMMIT v0.2.4 |
|
| 89 | 89 |
RUN set -x \ |
| 90 | 90 |
&& export GOPATH="$(mktemp -d)" \ |
| 91 | 91 |
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -215,7 +215,7 @@ RUN set -x \ |
| 215 | 215 |
&& rm -rf "$GOPATH" |
| 216 | 216 |
|
| 217 | 217 |
# Install containerd |
| 218 |
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 |
|
| 218 |
+ENV CONTAINERD_COMMIT v0.2.4 |
|
| 219 | 219 |
RUN set -x \ |
| 220 | 220 |
&& export GOPATH="$(mktemp -d)" \ |
| 221 | 221 |
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -208,7 +208,7 @@ RUN set -x \ |
| 208 | 208 |
&& rm -rf "$GOPATH" |
| 209 | 209 |
|
| 210 | 210 |
# Install containerd |
| 211 |
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 |
|
| 211 |
+ENV CONTAINERD_COMMIT v0.2.4 |
|
| 212 | 212 |
RUN set -x \ |
| 213 | 213 |
&& export GOPATH="$(mktemp -d)" \ |
| 214 | 214 |
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -68,7 +68,7 @@ RUN set -x \ |
| 68 | 68 |
&& rm -rf "$GOPATH" |
| 69 | 69 |
|
| 70 | 70 |
# Install containerd |
| 71 |
-ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 |
|
| 71 |
+ENV CONTAINERD_COMMIT v0.2.4 |
|
| 72 | 72 |
RUN set -x \ |
| 73 | 73 |
&& export GOPATH="$(mktemp -d)" \ |
| 74 | 74 |
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ |
| ... | ... |
@@ -136,7 +136,7 @@ clone git google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0 https |
| 136 | 136 |
clone git github.com/docker/docker-credential-helpers v0.3.0 |
| 137 | 137 |
|
| 138 | 138 |
# containerd |
| 139 |
-clone git github.com/docker/containerd 0ac3cd1be170d180b2baed755e8f0da547ceb267 |
|
| 139 |
+clone git github.com/docker/containerd v0.2.4 |
|
| 140 | 140 |
|
| 141 | 141 |
# cluster |
| 142 | 142 |
clone git github.com/docker/swarmkit bfbec9f2b6a487100a80027f6ee16cc0c646a8f5 |