bump golang 1.22.3 (#20433)

* bump golang 1.22.3 Signed-off-by: yminer <yminer@vmware.com> * debug api_common_install.sh Signed-off-by: yminer <yminer@vmware.com> * remove set DNS for docker v20 Signed-off-by: yminer <yminer@vmware.com> --------- Signed-off-by: yminer <yminer@vmware.com> Co-authored-by: Wang Yan <wangyan@vmware.com>
2024-11-25 03:35:21 +01:00 · 2024-05-16 14:32:59 +08:00 · 2024-05-16 14:32:59 +08:00 · 2da4d5883f
commit 2da4d5883f
parent 2b4fe6ced7
11 changed files with 35 additions and 32 deletions
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@ -44,7 +44,7 @@ jobs:
      - name: Set up Go 1.22
        uses: actions/setup-go@v5
        with:
-           go-version: 1.22.2
+           go-version: 1.22.3
        id: go
      - uses: actions/checkout@v3
        with:
@ -105,7 +105,7 @@ jobs:
      - name: Set up Go 1.22
        uses: actions/setup-go@v5
        with:
-          go-version: 1.22.2
+          go-version: 1.22.3
        id: go
      - uses: actions/checkout@v3
        with:
@ -160,7 +160,7 @@ jobs:
      - name: Set up Go 1.22
        uses: actions/setup-go@v5
        with:
-          go-version: 1.22.2
+          go-version: 1.22.3
        id: go
      - uses: actions/checkout@v3
        with:
@ -215,7 +215,7 @@ jobs:
      - name: Set up Go 1.22
        uses: actions/setup-go@v5
        with:
-          go-version: 1.22.2
+          go-version: 1.22.3
        id: go
      - uses: actions/checkout@v3
        with:
@ -268,7 +268,7 @@ jobs:
      - name: Set up Go 1.22
        uses: actions/setup-go@v5
        with:
-          go-version: 1.22.2
+          go-version: 1.22.3
        id: go
      - uses: actions/checkout@v3
        with:
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@ -26,7 +26,7 @@ jobs:
      - name: Set up Go 1.22
        uses: actions/setup-go@v5
        with:
-          go-version: 1.22.2
+          go-version: 1.22.3
        id: go
      - name: Setup Docker
        uses: docker-practice/actions-setup-docker@master
--- a/.github/workflows/conformance_test.yml
+++ b/.github/workflows/conformance_test.yml
@ -28,7 +28,7 @@ jobs:
      - name: Set up Go 1.21
        uses: actions/setup-go@v5
        with:
-          go-version: 1.22.2
+          go-version: 1.22.3
        id: go
      - uses: actions/checkout@v3
        with:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -165,7 +165,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   2.8    |    1.20.6     |
 |   2.9    |    1.21.3     |
 |   2.10   |    1.21.8     |
-|   2.11   |    1.22.2     |
+|   2.11   |    1.22.3     |


 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
--- a/2
+++ b/2
@ -140,7 +140,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.22.2
+GOBUILDIMAGE=golang:1.22.3
 GOBUILDPATHINCONTAINER=/harbor

 # go build
--- a/make/photon/registry/Dockerfile.binary
+++ b/make/photon/registry/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.22.2
+FROM golang:1.22.3

 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV BUILDTAGS include_oss include_gcs
--- a/make/photon/trivy-adapter/Dockerfile.binary
+++ b/make/photon/trivy-adapter/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.22.2
+FROM golang:1.22.3

 ADD .   /go/src/github.com/aquasecurity/harbor-scanner-trivy/
 WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/
--- 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.22.2..."
+echo "Building Trivy adapter binary based on golang:1.22.3..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP

--- a/src/go.mod
+++ b/src/go.mod
@ -1,6 +1,6 @@
 module github.com/goharbor/harbor/src

-go 1.22.2
+go 1.22.3

 require (
 	github.com/FZambia/sentinel v1.1.0
--- a/tests/ci/api_common_install.sh
+++ b/tests/ci/api_common_install.sh
@ -24,24 +24,27 @@ python --version
 # in container. So the current work round is read DNS server
 # from system and set the value in /etc/docker/daemon.json.

-ip addr
-docker_config_file="/etc/docker/daemon.json"
-dns_ip_string=$(netplan ip leases eth0 | grep -i dns | awk -F = '{print $2}' | tr " " "\n" | sed 's/,/","/g')
-dns=[\"${dns_ip_string}\"]
-echo dns=${dns}
+# ip addr
+# docker_config_file="/etc/docker/daemon.json"
+# dns_ip_string=$(netplan ip leases eth0 | grep -i dns | awk -F = '{print $2}' | tr " " "\n" | sed 's/,/","/g')
+# dns=[\"${dns_ip_string}\"]
+# echo dns=${dns}

-cat $docker_config_file
-if [ -f $docker_config_file ];then
-    if [ $(cat /etc/docker/daemon.json |grep \"dns\" |wc -l) -eq 0 ];then
-        sudo sed "s/}/,\n   \"dns\": $dns\n}/" -i $docker_config_file
-    fi
-else
-    echo "{\"dns\": $dns}" > $docker_config_file
-fi
-cat $docker_config_file
-sudo systemctl stop docker
-sudo systemctl start docker
-sleep 2
+# cat $docker_config_file
+# if [ -f $docker_config_file ];then
+#     if [ $(cat /etc/docker/daemon.json |grep \"dns\" |wc -l) -eq 0 ];then
+#         sudo sed "s/}/,\n   \"dns\": $dns\n}/" -i $docker_config_file
+#     fi
+# else
+#     echo "{\"dns\": $dns}" > $docker_config_file
+# fi
+# cat $docker_config_file
+# sudo systemctl stop docker
+# sudo systemctl start docker
+# # debug
+# sudo systemctl status docker.service
+# sudo journalctl -xeu docker.service
+# sleep 2
 #------------------------------------------------------------#

 sudo ./tests/hostcfg.sh
--- 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.22.2 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.22.2 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.22.3 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.22.3 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false