1. docker
  2. Commit 4dc392b2131e66c7019b505ac76e094364411d2f
Browse code

Update containerd to b93a33be39bc4ef0fb00bfcb79147

This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 7db7e046315eed5ccfb3a913b965be4b1a595601)

Michael Crosby authored on 2016/06/28 03:45:05
Showing 8 changed files
Dockerfile
History View file @ 4dc392b
... ... 
@@ -244,7 +244,7 @@ RUN set -x \
244 244 
 	&& rm -rf "$GOPATH"
245 245
246 246 
 # Install containerd
247 
-ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
247 
+ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
248 248 
 RUN set -x \
249 249 
 	&& export GOPATH="$(mktemp -d)" \
250 250 
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Dockerfile.aarch64
History View file @ 4dc392b
... ... 
@@ -191,7 +191,7 @@ RUN set -x \
191 191 
 	&& rm -rf "$GOPATH"
192 192
193 193 
 # Install containerd
194 
-ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
194 
+ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
195 195 
 RUN set -x \
196 196 
 	&& export GOPATH="$(mktemp -d)" \
197 197 
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Dockerfile.armhf
History View file @ 4dc392b
... ... 
@@ -200,7 +200,7 @@ RUN set -x \
200 200 
 	&& rm -rf "$GOPATH"
201 201
202 202 
 # Install containerd
203 
-ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
203 
+ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
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 @ 4dc392b
... ... 
@@ -85,7 +85,7 @@ RUN set -x \
85 85 
 	&& rm -rf "$GOPATH"
86 86
87 87 
 # Install containerd
88 
-ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
88 
+ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
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 @ 4dc392b
... ... 
@@ -215,7 +215,7 @@ RUN set -x \
215 215 
 	&& rm -rf "$GOPATH"
216 216
217 217 
 # Install containerd
218 
-ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
218 
+ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
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 @ 4dc392b
... ... 
@@ -208,7 +208,7 @@ RUN set -x \
208 208 
 	&& rm -rf "$GOPATH"
209 209
210 210 
 # Install containerd
211 
-ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
211 
+ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
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 @ 4dc392b
... ... 
@@ -68,7 +68,7 @@ RUN set -x \
68 68 
 	&& rm -rf "$GOPATH"
69 69
70 70 
 # Install containerd
71 
-ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
71 
+ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
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" \
hack/vendor.sh
History View file @ 4dc392b
... ... 
@@ -136,7 +136,7 @@ clone git google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0 https
136 136 
 clone git github.com/docker/docker-credential-helpers v0.3.0
137 137
138 138 
 # containerd
139 
-clone git github.com/docker/containerd 860f3a94940894ac0a106eff4bd1616a67407ee2
139 
+clone git github.com/docker/containerd b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
140 140
141 141 
 # cluster
142 142 
 clone git github.com/docker/swarmkit 3f135f206179ea157aeef2d1d401eb795f618da8