Преглед изворни кода

Merge pull request #42192 from tiborvass/rootlesskit_goproxy

hack: use GOPROXY for rootlesskit to workaround issue with old git on…
Akihiro Suda пре 4 година
родитељ
комит
dea989ea2f
1 измењених фајлова са 5 додато и 0 уклоњено
  1. 5 0
      hack/dockerfile/install/rootlesskit.installer

+ 5 - 0
hack/dockerfile/install/rootlesskit.installer

@@ -31,6 +31,11 @@ _install_rootlesskit() (
 	cd "$GOPATH/src/github.com/rootless-containers/rootlesskit" || exit 1
 	cd "$GOPATH/src/github.com/rootless-containers/rootlesskit" || exit 1
 	git checkout -q "$ROOTLESSKIT_COMMIT"
 	git checkout -q "$ROOTLESSKIT_COMMIT"
 	export GO111MODULE=on
 	export GO111MODULE=on
+	# TODO remove GOPROXY override once we updated to Go 1.14+
+	# Using goproxy instead of "direct" to work around an issue in go mod
+	# on Go 1.13 not working with older git versions (default version on
+	# CentOS 7 is git 1.8), see https://github.com/golang/go/issues/38373
+	export GOPROXY="https://proxy.golang.org"
 	for f in rootlesskit rootlesskit-docker-proxy; do
 	for f in rootlesskit rootlesskit-docker-proxy; do
 		go build $BUILD_MODE -ldflags="$ROOTLESSKIT_LDFLAGS" -o "${PREFIX}/$f" github.com/rootless-containers/rootlesskit/cmd/$f
 		go build $BUILD_MODE -ldflags="$ROOTLESSKIT_LDFLAGS" -o "${PREFIX}/$f" github.com/rootless-containers/rootlesskit/cmd/$f
 	done
 	done