From b01949b19aa476d1d55b0aa9c5cd831e46870f1e Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Mon, 5 Dec 2016 08:53:21 -0800 Subject: [PATCH] Updated containerd to 751172f160d15c234ec4a92d43105326e1195d7e This adds the use of tonistiigi/fifo Signed-off-by: Kenfe-Mickael Laventure --- 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 af828d5617..9f8f477e21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -253,7 +253,7 @@ RUN set -x \ && 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" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 867b942a6d..987aca886c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -192,7 +192,7 @@ RUN set -x \ && 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" \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 17e5b5a737..d0587e6407 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -201,7 +201,7 @@ RUN set -x \ && 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" \ diff --git a/Dockerfile.gccgo b/Dockerfile.gccgo index 94df8c4cb4..a032c51304 100644 --- a/Dockerfile.gccgo +++ b/Dockerfile.gccgo @@ -85,7 +85,7 @@ RUN set -x \ && 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" \ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index d34ea19b08..15526e946d 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -213,7 +213,7 @@ RUN set -x \ && 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" \ diff --git a/Dockerfile.s390x b/Dockerfile.s390x index cc1c616662..6382c82c7c 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -208,7 +208,7 @@ RUN set -x \ && 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" \ diff --git a/Dockerfile.simple b/Dockerfile.simple index 829f8e813a..baac1f3917 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -68,7 +68,7 @@ RUN set -x \ && 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" \ diff --git a/hack/vendor.sh b/hack/vendor.sh index 23861046ba..f812dfff01 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 0366d7e9693c930cf18c0f50cc16acec064e96c5 +clone git github.com/docker/containerd 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8 clone git github.com/tonistiigi/fifo fe870ccf293940774c2b44e23f6c71fff8f7547d # cluster