From f3fc0b4a4bc6dea1d9f8d19d24634c964d8dfda5 Mon Sep 17 00:00:00 2001 From: Ray Zhou Date: Fri, 15 May 2020 14:32:40 +0800 Subject: [PATCH 1/2] Add go module proxy in build.sh and readme --- README.md | 5 ++++- build.sh | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee9cb363..4f6995ff 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,10 @@ cd kubekey ./build.sh ``` -> Note: Docker needs to be installed before building. +**Note:** + +* Docker needs to be installed before building. +* If you have problem to access `https://proxy.golang.org/` in China mainland, please open the build.sh to use the Go module proxy in China. ## Road Map diff --git a/build.sh b/build.sh index f42f527b..5628e736 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,7 @@ #! /bin/bash -docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.14.2-buster go build -v -o kk +#docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.14.2-buster go build -v -o kk + +# Using the most trusted Go module proxy in China mainland +docker run --rm -e GO111MODULE=on -e GOPROXY=https://goproxy.cn -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.14.2-buster go build -v -o kk + From 673bd0df946f34a3fc6df8a82fc41cf07991abce Mon Sep 17 00:00:00 2001 From: Ray Zhou Date: Fri, 15 May 2020 14:33:25 +0800 Subject: [PATCH 2/2] Change the default go proxy --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 5628e736..6898e965 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #! /bin/bash -#docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.14.2-buster go build -v -o kk +docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.14.2-buster go build -v -o kk # Using the most trusted Go module proxy in China mainland -docker run --rm -e GO111MODULE=on -e GOPROXY=https://goproxy.cn -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.14.2-buster go build -v -o kk +# docker run --rm -e GO111MODULE=on -e GOPROXY=https://goproxy.cn -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.14.2-buster go build -v -o kk