[cherry-pick]bump golang to 1.20.10 (#19431)

Signed-off-by: yminer <[email protected]>
goharbor · Oct 11, 2023 · 6cdcb96 · 6cdcb96
1 parent 82c24ee
commit 6cdcb96
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-           go-version: 1.20.7
+           go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -105,7 +105,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -160,7 +160,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -215,7 +215,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -268,7 +268,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - name: Setup Docker
         uses: docker-practice/actions-setup-docker@master

diff --git a/.github/workflows/conformance_test.yml b/.github/workflows/conformance_test.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -166,7 +166,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   2.6    |    1.18.6     |
 |   2.7    |    1.19.4     |
 |   2.8    |    1.20.6     |
-|   2.9    |    1.20.7     |
+|   2.9    |    1.20.10    |
 
 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
 

diff --git a/Makefile b/Makefile
@@ -140,7 +140,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.20.7
+GOBUILDIMAGE=golang:1.20.10
 GOBUILDPATHINCONTAINER=/harbor
 
 # go build

diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM golang:1.20.7
+FROM golang:1.20.10
 
 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
@@ -1,4 +1,4 @@
-FROM golang:1.20.7
+FROM golang:1.20.10
 
 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
@@ -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.20.7..."
+echo "Building Trivy adapter binary based on golang:1.20.10..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP
 

diff --git 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.20.7 COMPILETAG=compile_golangimage 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.20.7 COMPILETAG=compile_golangimage 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.20.10 COMPILETAG=compile_golangimage 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.20.10 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false