Merge pull request #24231 from tiborvass/cherry-pick-containerd-race-fix
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
diff --git a/Dockerfile b/Dockerfile
index 4484549..b6158ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -244,7 +244,7 @@
&& rm -rf "$GOPATH"
# Install containerd
-ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
+ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
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 bdd49c7..52721c2 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -191,7 +191,7 @@
&& rm -rf "$GOPATH"
# Install containerd
-ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
+ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
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 2fb9ca6..6592ddd 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -200,7 +200,7 @@
&& rm -rf "$GOPATH"
# Install containerd
-ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
+ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
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 79dac49..f27865f 100644
--- a/Dockerfile.gccgo
+++ b/Dockerfile.gccgo
@@ -85,7 +85,7 @@
&& rm -rf "$GOPATH"
# Install containerd
-ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
+ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
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 ce295e6..a605c9b 100644
--- a/Dockerfile.ppc64le
+++ b/Dockerfile.ppc64le
@@ -215,7 +215,7 @@
&& rm -rf "$GOPATH"
# Install containerd
-ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
+ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
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 66d79fd..8c62a17 100644
--- a/Dockerfile.s390x
+++ b/Dockerfile.s390x
@@ -208,7 +208,7 @@
&& rm -rf "$GOPATH"
# Install containerd
-ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
+ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
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 0a62c53..0a6ffab 100644
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -68,7 +68,7 @@
&& rm -rf "$GOPATH"
# Install containerd
-ENV CONTAINERD_COMMIT b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
+ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
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 2204342..1cd71e4 100755
--- a/hack/vendor.sh
+++ b/hack/vendor.sh
@@ -136,7 +136,7 @@
clone git github.com/docker/docker-credential-helpers v0.3.0
# containerd
-clone git github.com/docker/containerd b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
+clone git github.com/docker/containerd 1b3a81545ca79456086dc2aa424357be98b962ee
# cluster
clone git github.com/docker/swarmkit 036a4a1e934bd1bbb35c3ec7f85dea2ba6d4e336
