Prechádzať zdrojové kódy

Merge pull request #23563 from icecrime/i_trust_crosbymichael

Use runc from crosbymichael's fork
Arnaud Porterie 9 rokov pred
rodič
commit
aab402731f
2 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 1 1
      hack/make/build-deb
  2. 1 1
      hack/make/build-rpm

+ 1 - 1
hack/make/build-deb

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

+ 1 - 1
hack/make/build-rpm

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