From 494d74d32df8e0f978e07ed0590e524b0f08d9f5 Mon Sep 17 00:00:00 2001 From: Wang Yan Date: Thu, 8 Jul 2021 16:25:15 +0800 Subject: [PATCH] bump up go version to 1.16 (#15286) Signed-off-by: Wang Yan --- .github/workflows/CI.yml | 20 ++++++++++---------- .github/workflows/build-package.yml | 4 ++-- .github/workflows/conformance_test.yml | 4 ++-- CONTRIBUTING.md | 5 +++-- Makefile | 4 ++-- make/photon/chartserver/builder | 2 +- make/photon/registry/Dockerfile.binary | 3 ++- make/photon/trivy-adapter/Dockerfile.binary | 2 +- make/photon/trivy-adapter/builder.sh | 2 +- src/go.mod | 2 +- tests/ci/distro_installer.sh | 4 ++-- tests/ci/ut_run.sh | 1 + tools/mockery/Dockerfile | 1 + 13 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 16acf8768..04cbd46af 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,10 +29,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15.12 + go-version: 1.16.5 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -95,10 +95,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15.12 + go-version: 1.16.5 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -155,10 +155,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15.12 + go-version: 1.16.5 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -215,10 +215,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15.12 + go-version: 1.16.5 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -273,10 +273,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15.12 + go-version: 1.16.5 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 1a3c533a7..65e9c6f21 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -26,10 +26,10 @@ jobs: service_account_key: ${{ secrets.GCP_SA_KEY }} export_default_credentials: true - run: gcloud info - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15.12 + go-version: 1.16.5 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/.github/workflows/conformance_test.yml b/.github/workflows/conformance_test.yml index 767e64bfd..9a55bdd5f 100644 --- a/.github/workflows/conformance_test.yml +++ b/.github/workflows/conformance_test.yml @@ -26,10 +26,10 @@ jobs: service_account_key: ${{ secrets.GCP_SA_KEY }} export_default_credentials: true - run: gcloud info - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15.12 + go-version: 1.16.5 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 903e30f33..8ed129d64 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -158,9 +158,10 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo | 1.9 | 1.12.12 | | 1.10 | 1.12.12 | | 2.0 | 1.13.15 | -| 2.1 | 1.14.13 | +| 2.1 | 1.14.13 | | 2.2 | 1.15.6 | -| 2.3 | 1.15.12 | +| 2.3 | 1.15.12 | +| 2.4 | 1.16.5 | Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions. diff --git a/Makefile b/Makefile index 8b260e495..255d9bab0 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ # compile_golangimage: # compile from golang image # for example: make compile_golangimage -e GOBUILDIMAGE= \ -# golang:1.15.12 +# golang:1.16.5 # compile_core, compile_jobservice: compile specific binary # # build: build Harbor docker images from photon baseimage @@ -156,7 +156,7 @@ GOINSTALL=$(GOCMD) install GOTEST=$(GOCMD) test GODEP=$(GOTEST) -i GOFMT=gofmt -w -GOBUILDIMAGE=golang:1.15.12 +GOBUILDIMAGE=golang:1.16.5 GOBUILDPATHINCONTAINER=/harbor # go build diff --git a/make/photon/chartserver/builder b/make/photon/chartserver/builder index e928b807c..6c68e3d94 100755 --- a/make/photon/chartserver/builder +++ b/make/photon/chartserver/builder @@ -4,7 +4,7 @@ set +e usage(){ echo "Usage: builder " - echo "e.g: builder golang:1.15.12 github.com/helm/chartmuseum v0.12.0 cmd/chartmuseum chartm" + echo "e.g: builder golang:1.16.5 github.com/helm/chartmuseum v0.12.0 cmd/chartmuseum chartm" exit 1 } diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary index 7e3e51c49..43f4b1c5d 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,7 +1,8 @@ -FROM golang:1.15.12 +FROM golang:1.16.5 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution ENV BUILDTAGS include_oss include_gcs +ENV GO111MODULE auto WORKDIR $DISTRIBUTION_DIR COPY . $DISTRIBUTION_DIR diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary index 8a8851487..c0cfa22b6 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.15.12 +FROM golang:1.16.5 ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/ WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/ diff --git a/make/photon/trivy-adapter/builder.sh b/make/photon/trivy-adapter/builder.sh index ae8baa5b5..fa25f45d7 100755 --- a/make/photon/trivy-adapter/builder.sh +++ b/make/photon/trivy-adapter/builder.sh @@ -19,7 +19,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX) git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP cd $TEMP; git checkout $VERSION; cd - -echo "Building Trivy adapter binary based on golang:1.15.12..." +echo "Building Trivy adapter binary based on golang:1.16.5..." cp Dockerfile.binary $TEMP docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP diff --git a/src/go.mod b/src/go.mod index 10a486542..6441d3611 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,6 +1,6 @@ module github.com/goharbor/harbor/src -go 1.15 +go 1.16 require ( github.com/Azure/azure-sdk-for-go v37.2.0+incompatible // indirect diff --git a/tests/ci/distro_installer.sh b/tests/ci/distro_installer.sh index 49038ea8b..abab8fac5 100755 --- a/tests/ci/distro_installer.sh +++ b/tests/ci/distro_installer.sh @@ -3,5 +3,5 @@ set -x set -e -sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.15.12 COMPILETAG=compile_golangimage BUILDBIN=true NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false -sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.15.12 COMPILETAG=compile_golangimage BUILDBIN=true NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false +sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.16.5 COMPILETAG=compile_golangimage BUILDBIN=true NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false +sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.16.5 COMPILETAG=compile_golangimage BUILDBIN=true NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false diff --git a/tests/ci/ut_run.sh b/tests/ci/ut_run.sh index 70860c952..3c3ad3375 100755 --- a/tests/ci/ut_run.sh +++ b/tests/ci/ut_run.sh @@ -6,6 +6,7 @@ set -e export POSTGRESQL_HOST=$1 export REGISTRY_URL=http://$1:5000 export CHROME_BIN=chromium-browser +export GO111MODULE=auto #export DISPLAY=:99.0 #sh -e /etc/init.d/xvfb start diff --git a/tools/mockery/Dockerfile b/tools/mockery/Dockerfile index 8c1a2bc58..c755f3cdb 100644 --- a/tools/mockery/Dockerfile +++ b/tools/mockery/Dockerfile @@ -5,6 +5,7 @@ ARG MOCKERY_VERSION # https://github.com/docker-library/golang/issues/225 ENV XDG_CACHE_HOME /tmp +ENV GO111MODULE auto RUN mkdir -p /tmp/mockery-${MOCKERY_VERSION} && \ curl -fsSL https://github.com/vektra/mockery/releases/download/${MOCKERY_VERSION}/mockery_${MOCKERY_VERSION#v}_Linux_x86_64.tar.gz | tar -xz -C /tmp/mockery-${MOCKERY_VERSION} && \