Merge pull request #23563 from icecrime/i_trust_crosbymichael

Use runc from crosbymichael's fork
This commit is contained in:
Arnaud Porterie 2016-06-15 04:14:13 +00:00 committed by GitHub
commit aab402731f
2 changed files with 2 additions and 2 deletions

View file

@ -73,7 +73,7 @@ set -e
# add runc and containerd compile and install
cat >> "$DEST/$version/Dockerfile.build" <<-EOF
# Install runc
RUN git clone https://github.com/opencontainers/runc.git "/go/src/github.com/opencontainers/runc" \
RUN git clone https://github.com/crosbymichael/runc.git "/go/src/github.com/opencontainers/runc" \
&& cd "/go/src/github.com/opencontainers/runc" \
&& git checkout -q "\$RUNC_COMMIT"
RUN set -x && export GOPATH="/go" && cd "/go/src/github.com/opencontainers/runc" \

View file

@ -100,7 +100,7 @@ set -e
# add runc and containerd compile and install
cat >> "$DEST/$version/Dockerfile.build" <<-EOF
# Install runc
RUN git clone https://github.com/opencontainers/runc.git "/go/src/github.com/opencontainers/runc" \
RUN git clone https://github.com/crosbymichael/runc.git "/go/src/github.com/opencontainers/runc" \
&& cd "/go/src/github.com/opencontainers/runc" \
&& git checkout -q "\$RUNC_COMMIT"
RUN set -x && export GOPATH="/go" && cd "/go/src/github.com/opencontainers/runc" \