From 4dc392b2131e66c7019b505ac76e094364411d2f Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 27 Jun 2016 11:45:05 -0700 Subject: [PATCH] Update containerd to b93a33be39bc4ef0fb00bfcb79147 This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 fixing the start sync issues. Signed-off-by: Michael Crosby (cherry picked from commit 7db7e046315eed5ccfb3a913b965be4b1a595601) --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- Dockerfile.gccgo | 2 +- Dockerfile.ppc64le | 2 +- Dockerfile.s390x | 2 +- Dockerfile.simple | 2 +- hack/vendor.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3411c50b2..4484549b81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -244,7 +244,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2 +ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 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.aarch64 b/Dockerfile.aarch64 index 4d070947d8..bdd49c7d52 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -191,7 +191,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2 +ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 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 80b7923ae5..2fb9ca6ab4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -200,7 +200,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2 +ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 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 dc7780e919..79dac49a79 100644 --- a/Dockerfile.gccgo +++ b/Dockerfile.gccgo @@ -85,7 +85,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2 +ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 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 d687c54d32..ce295e6ee9 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -215,7 +215,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2 +ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 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 a296b858ef..66d79fd451 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -208,7 +208,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2 +ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 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 9e11bb192c..0a62c530fa 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -68,7 +68,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install containerd -ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2 +ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ diff --git a/hack/vendor.sh b/hack/vendor.sh index 4a68b5799b..73abb1a213 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -136,7 +136,7 @@ clone git google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0 https clone git github.com/docker/docker-credential-helpers v0.3.0 # containerd -clone git github.com/docker/containerd 860f3a94940894ac0a106eff4bd1616a67407ee2 +clone git github.com/docker/containerd b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 # cluster clone git github.com/docker/swarmkit 3f135f206179ea157aeef2d1d401eb795f618da8