From bd1d441b013aba60e5db0a60658127abac83ee8a Mon Sep 17 00:00:00 2001 From: MinerYang Date: Fri, 29 Jul 2022 09:43:01 +0800 Subject: [PATCH] bumpup golang version to v1.18.4 (#17257) 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 | 4 ++-- make/photon/chartserver/builder | 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, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c8de2b3ff..f4bb29caf 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -32,7 +32,7 @@ jobs: - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.18.3 + go-version: 1.18.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -98,7 +98,7 @@ jobs: - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.18.3 + go-version: 1.18.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -158,7 +158,7 @@ jobs: - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.18.3 + go-version: 1.18.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -218,7 +218,7 @@ jobs: - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.18.3 + go-version: 1.18.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -276,7 +276,7 @@ jobs: - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.18.3 + go-version: 1.18.4 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 337e6ae25..0ab709733 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.18.3 + go-version: 1.18.4 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 0a5e7d0be..37ca3d821 100644 --- a/.github/workflows/conformance_test.yml +++ b/.github/workflows/conformance_test.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Go 1.18 uses: actions/setup-go@v1 with: - go-version: 1.18.3 + go-version: 1.18.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 784e2205d..7e77fdc73 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -163,7 +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 | +| 2.6 | 1.18.4 | Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions. diff --git a/Makefile b/Makefile index feff69eb1..8ae1d7e2e 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ # compile_golangimage: # compile from golang image # for example: make compile_golangimage -e GOBUILDIMAGE= \ -# golang:1.18.3 +# golang:1.18.4 # 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.18.3 +GOBUILDIMAGE=golang:1.18.4 GOBUILDPATHINCONTAINER=/harbor # go build diff --git a/make/photon/chartserver/builder b/make/photon/chartserver/builder index 8dad97ad5..1b40ff797 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.18.3 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm" + echo "e.g: builder golang:1.18.4 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 379db525c..3649d443e 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.18.3 +FROM golang:1.18.4 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 53bcdc1c4..925ad859c 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.18.3 +FROM golang:1.18.4 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 7cc004168..ae3a0813e 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.18.3..." +echo "Building Trivy adapter binary based on golang:1.18.4..." 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 bea5d4b22..83cc4ff36 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.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 +sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.18.4 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.4 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false