diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a8b055637..c8de2b3ff 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.17 + - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.17.7 + go-version: 1.18.3 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.17 + - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.17.7 + go-version: 1.18.3 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.17 + - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.17.7 + go-version: 1.18.3 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.17 + - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.17.7 + go-version: 1.18.3 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.17 + - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.17.7 + go-version: 1.18.3 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 0e60a5b94..586f52dbd 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.17 + - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.17.7 + go-version: 1.18.3 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 ddff4e813..0a5e7d0be 100644 --- a/.github/workflows/conformance_test.yml +++ b/.github/workflows/conformance_test.yml @@ -25,10 +25,10 @@ jobs: credentials_json: '${{ secrets.GCP_CREDENTIALS }}' - uses: google-github-actions/setup-gcloud@v0 - run: gcloud info - - name: Set up Go 1.17 + - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.17.7 + go-version: 1.18.3 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 607fe5cd9..784e2205d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -163,6 +163,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo | 2.3 | 1.15.12 | | 2.4 | 1.17.7 | | 2.5 | 1.17.7 | +| 2.6 | 1.18.3 | Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions. diff --git a/Makefile b/Makefile index 23375ed93..fa274e66e 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ # compile_golangimage: # compile from golang image # for example: make compile_golangimage -e GOBUILDIMAGE= \ -# golang:1.17.7 +# golang:1.18.3 # compile_core, compile_jobservice: compile specific binary # # build: build Harbor docker images from photon baseimage @@ -157,7 +157,7 @@ GOINSTALL=$(GOCMD) install GOTEST=$(GOCMD) test GODEP=$(GOTEST) -i GOFMT=gofmt -w -GOBUILDIMAGE=golang:1.17.7 +GOBUILDIMAGE=golang:1.18.3 GOBUILDPATHINCONTAINER=/harbor # go build diff --git a/make/photon/chartserver/builder b/make/photon/chartserver/builder index 22e64768e..8dad97ad5 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.17.7 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm" + echo "e.g: builder golang:1.18.3 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm" exit 1 } diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary index 7430ac6cb..379db525c 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.17.7 +FROM golang:1.18.3 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution ENV BUILDTAGS include_oss include_gcs diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary index eac43e86c..53bcdc1c4 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.17.7 +FROM golang:1.18.3 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 82b620261..7cc004168 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.17.7..." +echo "Building Trivy adapter binary based on golang:1.18.3..." 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 eeeb9448f..3a3471a60 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,6 +1,6 @@ module github.com/goharbor/harbor/src -go 1.17 +go 1.18 require ( github.com/FZambia/sentinel v1.1.0 @@ -49,7 +49,7 @@ require ( github.com/opencontainers/image-spec v1.0.2 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.11.0 - github.com/robfig/cron v1.0.0 + github.com/robfig/cron v1.0.0 // indirect github.com/robfig/cron/v3 v3.0.0 github.com/spf13/viper v1.8.1 github.com/stretchr/testify v1.7.0 diff --git a/tests/ci/distro_installer.sh b/tests/ci/distro_installer.sh index 169e418df..bea5d4b22 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-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.17.7 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false -sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.17.7 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false +sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.18.3 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false +sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.18.3 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false diff --git a/tests/ci/ut_install.sh b/tests/ci/ut_install.sh index 1e27af72f..32bf15ba9 100755 --- a/tests/ci/ut_install.sh +++ b/tests/ci/ut_install.sh @@ -4,8 +4,9 @@ set -x set -e sudo apt-get update && sudo apt-get install -y libldap2-dev -go get -d github.com/docker/distribution -go get -d github.com/docker/libtrust +sudo go env -w GO111MODULE=auto +go get github.com/docker/distribution +go get github.com/docker/libtrust go get golang.org/x/lint/golint go get github.com/GeertJohan/fgt go get github.com/dghubble/sling @@ -20,7 +21,6 @@ sudo service postgresql stop || echo no postgresql need to be stopped sleep 2 sudo rm -rf /data/* -sudo go env -w GO111MODULE=auto sudo -E env "PATH=$PATH" make go_check sudo ./tests/hostcfg.sh sudo ./tests/generateCerts.sh