From 33a8310bc8f027bf62aba4b07fc5b625fa3f93d9 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Thu, 21 Jul 2016 10:21:52 -0700 Subject: [PATCH] Harmonize containerd commit used by all Dockerfile When #24648 was merged, only the main Dockerfile was updated with the new containerd commit, this commit brings the other Dockerfile up to speed. Signed-off-by: Kenfe-Mickael Laventure (cherry picked from commit d5cbc57eff0df651bfbfb455608da45747651d0c) Signed-off-by: Tibor Vass --- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- Dockerfile.gccgo | 2 +- Dockerfile.ppc64le | 2 +- Dockerfile.s390x | 2 +- Dockerfile.simple | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c8653d5883..2fd81578a7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -192,7 +192,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf +ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e59b50107e..3318b4fcfe 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -200,7 +200,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf +ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.gccgo b/Dockerfile.gccgo index 78a0db556f..4206a421cd 100644 --- a/Dockerfile.gccgo +++ b/Dockerfile.gccgo @@ -85,7 +85,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf +ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 273bb1ec7a..9a05277fd4 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -215,7 +215,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf +ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.s390x b/Dockerfile.s390x index affbcc3020..9bc965d229 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -208,7 +208,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf +ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/Dockerfile.simple b/Dockerfile.simple index b0d455e3f2..48fa1ba39e 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -68,7 +68,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf +ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \