1. docker
  2. Commit 33a8310bc8f027bf62aba4b07fc5b625fa3f93d9
Browse code

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 <mickael.laventure@gmail.com>
(cherry picked from commit d5cbc57eff0df651bfbfb455608da45747651d0c)
Signed-off-by: Tibor Vass <tibor@docker.com>

Kenfe-Mickael Laventure authored on 2016/07/22 02:21:52
Showing 6 changed files
Dockerfile.aarch64
History View file @ 33a8310
... ... 
@@ -192,7 +192,7 @@ RUN set -x \
192 192 
 	&& rm -rf "$GOPATH"
193 193
194 194 
 # Install containerd
195 
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
195 
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
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" \
Dockerfile.armhf
History View file @ 33a8310
... ... 
@@ -200,7 +200,7 @@ RUN set -x \
200 200 
 	&& rm -rf "$GOPATH"
201 201
202 202 
 # Install containerd
203 
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
203 
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
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" \
Dockerfile.gccgo
History View file @ 33a8310
... ... 
@@ -85,7 +85,7 @@ RUN set -x \
85 85 
 	&& rm -rf "$GOPATH"
86 86
87 87 
 # Install containerd
88 
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
88 
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
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" \
Dockerfile.ppc64le
History View file @ 33a8310
... ... 
@@ -215,7 +215,7 @@ RUN set -x \
215 215 
 	&& rm -rf "$GOPATH"
216 216
217 217 
 # Install containerd
218 
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
218 
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
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" \
Dockerfile.s390x
History View file @ 33a8310
... ... 
@@ -208,7 +208,7 @@ RUN set -x \
208 208 
 	&& rm -rf "$GOPATH"
209 209
210 210 
 # Install containerd
211 
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
211 
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
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" \
Dockerfile.simple
History View file @ 33a8310
... ... 
@@ -68,7 +68,7 @@ RUN set -x \
68 68 
 	&& rm -rf "$GOPATH"
69 69
70 70 
 # Install containerd
71 
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
71 
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
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" \