Skip to content

Commit

Permalink
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
Browse files Browse the repository at this point in the history
Signed-off-by: Kenfe-Mickael Laventure <[email protected]>
(cherry picked from commit 2685c82)
  • Loading branch information
mlaventure authored and Tibor Vass committed Jul 1, 2016
1 parent 39bc769 commit 5199e39
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.gccgo
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ppc64le
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.s390x
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.simple
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion hack/vendor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5199e39

Please sign in to comment.