Browse code

Merge pull request #24904 from mlaventure/update-dockerfile-containerd-commit

Harmonize containerd commit used by all Dockerfile

Sebastiaan van Stijn authored on 2016/07/22 06:18:41
Showing 6 changed files
... ...
@@ -195,7 +195,7 @@ RUN set -x \
195 195
 	&& rm -rf "$GOPATH"
196 196
 
197 197
 # Install containerd
198
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
198
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
199 199
 RUN set -x \
200 200
 	&& export GOPATH="$(mktemp -d)" \
201 201
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
... ...
@@ -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" \
... ...
@@ -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" \
... ...
@@ -213,7 +213,7 @@ RUN set -x \
213 213
 	&& rm -rf "$GOPATH"
214 214
 
215 215
 # Install containerd
216
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
216
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
217 217
 RUN set -x \
218 218
 	&& export GOPATH="$(mktemp -d)" \
219 219
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
... ...
@@ -217,7 +217,7 @@ RUN set -x \
217 217
 	&& rm -rf "$GOPATH"
218 218
 
219 219
 # Install containerd
220
-ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
220
+ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
221 221
 RUN set -x \
222 222
 	&& export GOPATH="$(mktemp -d)" \
223 223
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
... ...
@@ -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" \