toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade containerd to latest version.

Browse Source 
Necessary for merging in #22049.

Signed-off-by: Ross Boucher <rboucher@gmail.com>
Upstream-commit: e0123adafdc1e6a14a1dac10c5371da11b6fc063
Component: engine
This commit is contained in:
boucher
2016-08-26 14:17:35 -04:00
parent 9d1926d2b8
commit 0ef65cbad6
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/Dockerfile
+1 -1
View File
@@ -239,7 +239,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
components/engine/Dockerfile.aarch64
+1 -1
View File
@@ -195,7 +195,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
components/engine/Dockerfile.armhf
+1 -1
View File
@@ -193,7 +193,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
components/engine/Dockerfile.ppc64le
+1 -1
View File
@@ -206,7 +206,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
components/engine/Dockerfile.s390x
+1 -1
View File
@@ -214,7 +214,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
components/engine/Dockerfile.simple
+1 -1
View File
@@ -68,7 +68,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
ENV CONTAINERD_COMMIT 8508d2bec90b96403143a1104cdcbd56f6aeb361
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
components/engine/hack/vendor.sh
+1 -1
View File
@@ -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 0ac3cd1be170d180b2baed755e8f0da547ceb267
clone git github.com/docker/containerd 8508d2bec90b96403143a1104cdcbd56f6aeb361
# cluster
clone git github.com/docker/swarmkit 8a761950fb4d9251c335dc6149a8a02756cb3b10