1. docker
  2. Commit 1987d6e5df59812a16c5e3d9d8a229e1310bf5e1
Browse code

Update runc/containerd

Contains fixes for:
- pid.max fix that is causing hang on network stats test.
- fix for early stdin close containerd-shim
- better logging for `could not synchronise with container process`

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 22d997b3745e278d5a2b0b85d56c0d2b166e3a74)

Tonis Tiigi authored on 2016/03/23 11:55:25
Showing 7 changed files
Dockerfile
History View file @ 1987d6e
... ... 
@@ -247,7 +247,7 @@ RUN set -x \
247 247 
 	&& rm -rf "$GOPATH"
248 248
249 249 
 # Install runc
250 
-ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6
250 
+ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf
251 251 
 RUN set -x \
252 252 
 	&& export GOPATH="$(mktemp -d)" \
253 253 
 	&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
... ... 
@@ -257,7 +257,7 @@ RUN set -x \
257 257 
 	&& cp runc /usr/local/bin/docker-runc
258 258
259 259 
 # Install containerd
260 
-ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8
260 
+ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f
261 261 
 RUN set -x \
262 262 
 	&& export GOPATH="$(mktemp -d)" \
263 263 
 	&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Dockerfile.aarch64
History View file @ 1987d6e
... ... 
@@ -187,7 +187,7 @@ RUN set -x \
187 187 
 	&& rm -rf "$GOPATH"
188 188
189 189 
 # Install runc
190 
-ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6
190 
+ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf
191 191 
 RUN set -x \
192 192 
 	&& export GOPATH="$(mktemp -d)" \
193 193 
 	&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
... ... 
@@ -197,7 +197,7 @@ RUN set -x \
197 197 
 	&& cp runc /usr/local/bin/docker-runc
198 198
199 199 
 # Install containerd
200 
-ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8
200 
+ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f
201 201 
 RUN set -x \
202 202 
 	&& export GOPATH="$(mktemp -d)" \
203 203 
 	&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Dockerfile.armhf
History View file @ 1987d6e
... ... 
@@ -197,7 +197,7 @@ RUN set -x \
197 197 
 	&& rm -rf "$GOPATH"
198 198
199 199 
 # Install runc
200 
-ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6
200 
+ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf
201 201 
 RUN set -x \
202 202 
 	&& export GOPATH="$(mktemp -d)" \
203 203 
 	&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
... ... 
@@ -207,7 +207,7 @@ RUN set -x \
207 207 
 	&& cp runc /usr/local/bin/docker-runc
208 208
209 209 
 # Install containerd
210 
-ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8
210 
+ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f
211 211 
 RUN set -x \
212 212 
 	&& export GOPATH="$(mktemp -d)" \
213 213 
 	&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Dockerfile.gccgo
History View file @ 1987d6e
... ... 
@@ -74,7 +74,7 @@ WORKDIR /go/src/github.com/docker/docker
74 74 
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux
75 75
76 76 
 # Install runc
77 
-ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6
77 
+ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf
78 78 
 RUN set -x \
79 79 
 	&& export GOPATH="$(mktemp -d)" \
80 80 
 	&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
... ... 
@@ -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 142e22a4dce86f3b8ce068a0b043489d21976bb8
87 
+ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f
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" \
Dockerfile.ppc64le
History View file @ 1987d6e
... ... 
@@ -198,7 +198,7 @@ RUN set -x \
198 198 
 	&& rm -rf "$GOPATH"
199 199
200 200 
 # Install runc
201 
-ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6
201 
+ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf
202 202 
 RUN set -x \
203 203 
 	&& export GOPATH="$(mktemp -d)" \
204 204 
 	&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
... ... 
@@ -208,7 +208,7 @@ RUN set -x \
208 208 
 	&& cp runc /usr/local/bin/docker-runc
209 209
210 210 
 # Install containerd
211 
-ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8
211 
+ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f
212 212 
 RUN set -x \
213 213 
 	&& export GOPATH="$(mktemp -d)" \
214 214 
 	&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Dockerfile.s390x
History View file @ 1987d6e
... ... 
@@ -177,7 +177,7 @@ RUN set -x \
177 177 
 	&& rm -rf "$GOPATH"
178 178
179 179 
 # Install runc
180 
-ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6
180 
+ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf
181 181 
 RUN set -x \
182 182 
 	&& export GOPATH="$(mktemp -d)" \
183 183 
 	&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
... ... 
@@ -187,7 +187,7 @@ RUN set -x \
187 187 
 	&& cp runc /usr/local/bin/docker-runc
188 188
189 189 
 # Install containerd
190 
-ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8
190 
+ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f
191 191 
 RUN set -x \
192 192 
 	&& export GOPATH="$(mktemp -d)" \
193 193 
 	&& git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Dockerfile.simple
History View file @ 1987d6e
... ... 
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
30 30 
 	&& rm -rf /var/lib/apt/lists/*
31 31
32 32 
 # Install runc
33 
-ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6
33 
+ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf
34 34 
 RUN set -x \
35 35 
 	&& export GOPATH="$(mktemp -d)" \
36 36 
 	&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
... ... 
@@ -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 142e22a4dce86f3b8ce068a0b043489d21976bb8
43 
+ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f
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" \