From 38c206f97b7179d8fac53d9fc8e425f08a26eea8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 6 Apr 2016 13:31:26 -0700 Subject: [PATCH] bump containerd binary for 1.11.0-rc4 this bumps the containerd binary in the Dockerfiles for 1.11.0-rc4, to include https://github.com/docker/containerd/pull/184 NOTE: the hack/vendor.sh commit is NOT updated in this patch; there's no reason to update containerd there Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- Dockerfile.gccgo | 2 +- Dockerfile.ppc64le | 2 +- Dockerfile.s390x | 2 +- Dockerfile.simple | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8215c69dc..5945bac171 100644 --- a/Dockerfile +++ b/Dockerfile @@ -258,7 +258,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d +ENV CONTAINERD_COMMIT d2f03861c91edaafdcb3961461bf82ae83785ed7 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 c783fe2295..1b80c0c54a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -191,7 +191,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d +ENV CONTAINERD_COMMIT d2f03861c91edaafdcb3961461bf82ae83785ed7 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 5d3d4f7a8a..bf8194238c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -208,7 +208,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d +ENV CONTAINERD_COMMIT d2f03861c91edaafdcb3961461bf82ae83785ed7 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 99667f8a65..08772fb210 100644 --- a/Dockerfile.gccgo +++ b/Dockerfile.gccgo @@ -85,7 +85,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d +ENV CONTAINERD_COMMIT d2f03861c91edaafdcb3961461bf82ae83785ed7 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 91dadec389..a68d863d2e 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -209,7 +209,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d +ENV CONTAINERD_COMMIT d2f03861c91edaafdcb3961461bf82ae83785ed7 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 53cdcbb8c8..ba642b4eed 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -188,7 +188,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d +ENV CONTAINERD_COMMIT d2f03861c91edaafdcb3961461bf82ae83785ed7 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 b064aa9ec0..7e582f8d07 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -40,7 +40,7 @@ RUN set -x \ && cp runc /usr/local/bin/docker-runc # Install containerd -ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d +ENV CONTAINERD_COMMIT d2f03861c91edaafdcb3961461bf82ae83785ed7 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone git://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \