From 22d997b3745e278d5a2b0b85d56c0d2b166e3a74 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 22 Mar 2016 19:55:25 -0700 Subject: [PATCH] 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 --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- Dockerfile.gccgo | 4 ++-- Dockerfile.ppc64le | 4 ++-- Dockerfile.s390x | 4 ++-- Dockerfile.simple | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 16161ac787..41e9f865d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -247,7 +247,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6 +ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ @@ -257,7 +257,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8 +ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 267820a9b7..5f25b4155d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -187,7 +187,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6 +ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ @@ -197,7 +197,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8 +ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 59d2fbe659..257edfa53f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -197,7 +197,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6 +ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ @@ -207,7 +207,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8 +ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.gccgo b/Dockerfile.gccgo index a8d5d879da..8135bc1c5a 100644 --- a/Dockerfile.gccgo +++ b/Dockerfile.gccgo @@ -74,7 +74,7 @@ WORKDIR /go/src/github.com/docker/docker ENV DOCKER_BUILDTAGS apparmor seccomp selinux # Install runc -ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6 +ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ @@ -84,7 +84,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8 +ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index e69b6ea050..86f99a1926 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -198,7 +198,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6 +ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ @@ -208,7 +208,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8 +ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.s390x b/Dockerfile.s390x index f50f06a8f6..941ab2cdae 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -177,7 +177,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6 +ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ @@ -187,7 +187,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8 +ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.simple b/Dockerfile.simple index 8793cf2590..0b8231032a 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* # Install runc -ENV RUNC_COMMIT bbde9c426ff363d813b8722f0744115c13b408b6 +ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ @@ -40,7 +40,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 142e22a4dce86f3b8ce068a0b043489d21976bb8 +ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \