beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #27693 from mlaventure/update-containerd-fix-json-compat

Browse source 
Update containerd to b818e749726ba18e430bb825396c85408dfaf2a4
This commit is contained in:
Michael Crosby 2016-10-24 13:29:24 -07:00 committed by GitHub
commit ca151de73c
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -253,7 +253,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0366d7e9693c930cf18c0f50cc16acec064e96c5
ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

2
Dockerfile.aarch64
View file

@ -192,7 +192,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0366d7e9693c930cf18c0f50cc16acec064e96c5
ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

2
Dockerfile.armhf
View file

@ -201,7 +201,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0366d7e9693c930cf18c0f50cc16acec064e96c5
ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

2
Dockerfile.gccgo
View file

@ -85,7 +85,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0366d7e9693c930cf18c0f50cc16acec064e96c5
ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

2
Dockerfile.ppc64le
View file

@ -213,7 +213,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0366d7e9693c930cf18c0f50cc16acec064e96c5
ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

2
Dockerfile.s390x
View file

@ -208,7 +208,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0366d7e9693c930cf18c0f50cc16acec064e96c5
ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

2
Dockerfile.simple
View file

@ -68,7 +68,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 0366d7e9693c930cf18c0f50cc16acec064e96c5
ENV CONTAINERD_COMMIT b818e749726ba18e430bb825396c85408dfaf2a4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \