diff --git a/Dockerfile b/Dockerfile index 95e031a2..cd21f77f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/Makefile b/Makefile index 33cca024..4f93f108 100644 --- a/Makefile +++ b/Makefile @@ -231,7 +231,7 @@ binary: -e GOARCH=amd64 \ -e CGO_ENABLED=0 \ -e GO111MODULE=on \ - -w /usr/src/myapp golang:1.16 \ + -w /usr/src/myapp golang:1.17 \ go build -ldflags '$(LDFLAGS)' -v -o output/linux/amd64/kk ./cmd/main.go # linux sha256sum output/linux/amd64/kk || shasum -a 256 output/linux/amd64/kk @@ -241,7 +241,7 @@ binary: -e GOARCH=arm64 \ -e CGO_ENABLED=0 \ -e GO111MODULE=on \ - -w /usr/src/myapp golang:1.16 \ + -w /usr/src/myapp golang:1.17 \ go build -ldflags '$(LDFLAGS)' -v -o output/linux/arm64/kk ./cmd/main.go # linux sha256sum output/linux/arm64/kk || shasum -a 256 output/linux/arm64/kk diff --git a/build.sh b/build.sh index e4e86876..534b1631 100755 --- a/build.sh +++ b/build.sh @@ -24,10 +24,10 @@ LDFLAGS="-X github.com/kubesphere/kubekey/version.version=${VERSION} if [ -n "$1" ]; then if [ "$1" == "-p" ] || [ "$1" == "--proxy" ]; then # Using the most trusted Go module proxy in China - docker run --rm -e GO111MODULE=on -e GOPROXY=https://goproxy.cn -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.16 go build -ldflags "$LDFLAGS" -v -o output/kk ./cmd/main.go + docker run --rm -e GO111MODULE=on -e GOPROXY=https://goproxy.cn -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.17 go build -ldflags "$LDFLAGS" -v -o output/kk ./cmd/main.go else echo "The option should be '-p' or '--proxy'" fi else - docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.16 go build -ldflags "$LDFLAGS" -v -o output/kk ./cmd/main.go + docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.17 go build -ldflags "$LDFLAGS" -v -o output/kk ./cmd/main.go fi diff --git a/go.mod b/go.mod index 5a4955f2..cb41e029 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kubesphere/kubekey -go 1.16 +go 1.17 require ( github.com/containerd/containerd v1.5.8