From 5199e3960ece00a13f888ceefb794aa59f2d15bc Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Fri, 1 Jul 2016 11:45:19 -0700 Subject: [PATCH] Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee Signed-off-by: Kenfe-Mickael Laventure (cherry picked from commit 2685c82c2e1e75c1f7b39e8cb6e3d5acf258654d) --- 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 4484549b81..b6158ffb93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -244,7 +244,7 @@ RUN set -x \ && 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 bdd49c7d52..52721c2dde 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -191,7 +191,7 @@ RUN set -x \ && 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 2fb9ca6ab4..6592ddd246 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -200,7 +200,7 @@ RUN set -x \ && 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 79dac49a79..f27865f9b5 100644 --- a/Dockerfile.gccgo +++ b/Dockerfile.gccgo @@ -85,7 +85,7 @@ RUN set -x \ && 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 ce295e6ee9..a605c9bb62 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -215,7 +215,7 @@ RUN set -x \ && 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 66d79fd451..8c62a174c6 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -208,7 +208,7 @@ RUN set -x \ && 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 0a62c530fa..0a6ffab6ef 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -68,7 +68,7 @@ RUN set -x \ && 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 22043421f4..1cd71e48ad 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 b93a33be39bc4ef0fb00bfcb79147a28c33d9d43 +clone git github.com/docker/containerd 1b3a81545ca79456086dc2aa424357be98b962ee # cluster clone git github.com/docker/swarmkit 036a4a1e934bd1bbb35c3ec7f85dea2ba6d4e336