commit dbbcc8f549f7c244bc56cc54e0ed3530fbcc0880
author Victor Vieux <victorvieux@gmail.com> Wed Dec 07 13:31:17 2016 -0800
committer GitHub <noreply@github.com> Wed Dec 07 13:31:17 2016 -0800
tree 21e21ab66e3b3dc32fe9741482bb248399707c0f
parent c808ae8c5b933ddbf184e7e57118a3fe69ffe210
parent b01949b19aa476d1d55b0aa9c5cd831e46870f1e

Merge pull request #29141 from mlaventure/1.12.x-containerd-fifo

[1.12.x] Updated containerd to 751172f160d15c234ec4a92d43105326e1195d7e

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 2b68c23..ea15ae4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -253,7 +253,7 @@
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
+ENV CONTAINERD_COMMIT 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

Dockerfile.aarch64

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a90d8ec..6e5f483 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -192,7 +192,7 @@
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
+ENV CONTAINERD_COMMIT 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

Dockerfile.armhf

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index eae1fa6..aa587a7 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -201,7 +201,7 @@
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
+ENV CONTAINERD_COMMIT 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

Dockerfile.gccgo

diff --git a/Dockerfile.gccgo b/Dockerfile.gccgo
index 94df8c4..a032c51 100644
--- a/Dockerfile.gccgo
+++ b/Dockerfile.gccgo
@@ -85,7 +85,7 @@
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
+ENV CONTAINERD_COMMIT 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

Dockerfile.ppc64le

diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
index 2835e5a..a3a69aa 100644
--- a/Dockerfile.ppc64le
+++ b/Dockerfile.ppc64le
@@ -213,7 +213,7 @@
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
+ENV CONTAINERD_COMMIT 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

Dockerfile.s390x

diff --git a/Dockerfile.s390x b/Dockerfile.s390x
index cc1c616..6382c82 100644
--- a/Dockerfile.s390x
+++ b/Dockerfile.s390x
@@ -208,7 +208,7 @@
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
+ENV CONTAINERD_COMMIT 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

Dockerfile.simple

diff --git a/Dockerfile.simple b/Dockerfile.simple
index 59df969..07edadd 100644
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -68,7 +68,7 @@
 	&& rm -rf "$GOPATH"
 
 # Install containerd
-ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
+ENV CONTAINERD_COMMIT 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

hack/vendor.sh

diff --git a/hack/vendor.sh b/hack/vendor.sh
index ddacf16..a6fc6d2 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 0366d7e9693c930cf18c0f50cc16acec064e96c5
+clone git github.com/docker/containerd 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8
 clone git github.com/tonistiigi/fifo fe870ccf293940774c2b44e23f6c71fff8f7547d
 
 # cluster