From d75ff342f1d6a1d98ec80f2217aaf2465f075c81 Mon Sep 17 00:00:00 2001 From: MinerYang Date: Fri, 12 Apr 2024 14:21:37 +0800 Subject: [PATCH] bump golang to 1.21.9 on release-2.8.0 (#20267) Signed-off-by: yminer --- .github/workflows/CI.yml | 10 +++++----- .github/workflows/build-package.yml | 2 +- .github/workflows/conformance_test.yml | 2 +- CONTRIBUTING.md | 2 +- Makefile | 2 +- make/photon/golang/Dockerfile | 2 +- make/photon/registry/Dockerfile.binary | 2 +- make/photon/trivy-adapter/Dockerfile.binary | 2 +- make/photon/trivy-adapter/builder.sh | 2 +- tests/ci/distro_installer.sh | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 180c98581..374519fd1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -36,7 +36,7 @@ jobs: - name: Set up Go 1.21 uses: actions/setup-go@v1 with: - go-version: 1.21.7 + go-version: 1.21.9 id: go - uses: actions/checkout@v3 with: @@ -97,7 +97,7 @@ jobs: - name: Set up Go 1.21 uses: actions/setup-go@v1 with: - go-version: 1.21.7 + go-version: 1.21.9 id: go - uses: actions/checkout@v3 with: @@ -152,7 +152,7 @@ jobs: - name: Set up Go 1.21 uses: actions/setup-go@v1 with: - go-version: 1.21.7 + go-version: 1.21.9 id: go - uses: actions/checkout@v3 with: @@ -207,7 +207,7 @@ jobs: - name: Set up Go 1.21 uses: actions/setup-go@v1 with: - go-version: 1.21.7 + go-version: 1.21.9 id: go - uses: actions/checkout@v3 with: @@ -260,7 +260,7 @@ jobs: - name: Set up Go 1.21 uses: actions/setup-go@v1 with: - go-version: 1.21.7 + go-version: 1.21.9 id: go - uses: actions/checkout@v3 with: diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 18a9b3d15..1359e76c1 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.21 uses: actions/setup-go@v1 with: - go-version: 1.21.7 + go-version: 1.21.9 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 index dce2a6b0d..5c7bfc5f8 100644 --- 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@v1 with: - go-version: 1.21.7 + go-version: 1.21.9 id: go - uses: actions/checkout@v3 with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b6bdb20e5..1fd555112 100644 --- 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.5 | 1.17.7 | | 2.6 | 1.18.6 | | 2.7 | 1.19.4 | -| 2.8 | 1.21.7 | +| 2.8 | 1.21.9 | Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions. diff --git a/Makefile b/Makefile index 657240626..7bce4ffcb 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ GOINSTALL=$(GOCMD) install GOTEST=$(GOCMD) test GODEP=$(GOTEST) -i GOFMT=gofmt -w -GOVERSION=1.21.7 +GOVERSION=1.21.9 GOBUILDIMAGE=goharbor/golang:$(GOVERSION) PUSHGOIMAGE=false GOBUILDPATHINCONTAINER=/harbor diff --git a/make/photon/golang/Dockerfile b/make/photon/golang/Dockerfile index 46cae02ca..5d27ab411 100644 --- a/make/photon/golang/Dockerfile +++ b/make/photon/golang/Dockerfile @@ -12,7 +12,7 @@ ENV GOLANG_VERSION ${GOVERSION} RUN set eux; \ url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \ - sha256="13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c"; \ + sha256="f76194c2dc607e0df4ed2e7b825b5847cb37e34fc70d780e2f6c7e805634a7ea"; \ wget -O go.tgz.asc "$url.asc"; \ wget -O go.tgz "$url"; \ echo "$sha256 *go.tgz" | sha256sum -c -; \ diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary index 466954e38..322fbef5a 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM goharbor/golang:1.21.7 +FROM goharbor/golang:1.21.9 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 611ff3e6a..a4720af46 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM goharbor/golang:1.21.7 +FROM goharbor/golang:1.21.9 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 afa2371ea..17713aa59 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 goharbor/golang:1.21.7..." +echo "Building Trivy adapter binary based on goharbor/golang:1.21.9..." 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 index ec056f08a..a8ab3580b 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=goharbor/golang:1.21.7 COMPILETAG=compile_golangimage NOTARYFLAG=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=goharbor/golang:1.21.7 COMPILETAG=compile_golangimage NOTARYFLAG=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=goharbor/golang:1.21.9 COMPILETAG=compile_golangimage NOTARYFLAG=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=goharbor/golang:1.21.9 COMPILETAG=compile_golangimage NOTARYFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false