bump up golang to 1.19.2 (#17694)

Signed-off-by: yminer <yminer@vmware.com> Signed-off-by: yminer <yminer@vmware.com>
2024-11-10 12:40:19 +01:00 · 2022-10-26 20:28:19 +08:00 · 2022-10-26 20:28:19 +08:00 · 6b8cdc03c1
commit 6b8cdc03c1
parent 0acfbdc7a1
10 changed files with 15 additions and 15 deletions
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@ -32,7 +32,7 @@ jobs:
      - name: Set up Go 1.19
        uses: actions/setup-go@v1
        with:
-           go-version: 1.19.1
+           go-version: 1.19.2
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@1.0.11
@ -98,7 +98,7 @@ jobs:
      - name: Set up Go 1.19
        uses: actions/setup-go@v1
        with:
-          go-version: 1.19.1
+          go-version: 1.19.2
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@1.0.11
@ -158,7 +158,7 @@ jobs:
      - name: Set up Go 1.19
        uses: actions/setup-go@v1
        with:
-          go-version: 1.19.1
+          go-version: 1.19.2
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@1.0.11
@ -218,7 +218,7 @@ jobs:
      - name: Set up Go 1.19
        uses: actions/setup-go@v1
        with:
-          go-version: 1.19.1
+          go-version: 1.19.2
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@1.0.11
@ -276,7 +276,7 @@ jobs:
      - name: Set up Go 1.19
        uses: actions/setup-go@v1
        with:
-          go-version: 1.19.1
+          go-version: 1.19.2
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@1.0.11
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@ -28,7 +28,7 @@ jobs:
      - name: Set up Go 1.19
        uses: actions/setup-go@v1
        with:
-          go-version: 1.19.1
+          go-version: 1.19.2
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@1.0.11
--- a/.github/workflows/conformance_test.yml
+++ b/.github/workflows/conformance_test.yml
@ -28,7 +28,7 @@ jobs:
      - name: Set up Go 1.19
        uses: actions/setup-go@v1
        with:
-          go-version: 1.19.1
+          go-version: 1.19.2
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@1.0.11
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -164,7 +164,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   2.4    |    1.17.7     |
 |   2.5    |    1.17.7     |
 |   2.6    |    1.18.6     |
-|   2.7    |    1.19.1     |
+|   2.7    |    1.19.2     |

 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.

--- a/2
+++ b/2
@ -155,7 +155,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.19.1
+GOBUILDIMAGE=golang:1.19.2
 GOBUILDPATHINCONTAINER=/harbor

 # go build
--- a/make/photon/chartserver/builder
+++ b/make/photon/chartserver/builder
@ -4,7 +4,7 @@ set +e

 usage(){
  echo "Usage: builder <golang image:version> <code path> <code release tag> <main.go path> <binary name>"
-  echo "e.g: builder golang:1.19.1 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm"
+  echo "e.g: builder golang:1.19.2 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm"
  exit 1
 }

--- a/make/photon/registry/Dockerfile.binary
+++ b/make/photon/registry/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.19.1
+FROM golang:1.19.2

 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.19.1
+FROM golang:1.19.2

 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.19.1..."
+echo "Building Trivy adapter binary based on golang:1.19.2..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP

--- 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.19.1 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.19.1 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.19.2 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.19.2 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false