bump golang1.20.6 on release-2.8.0& build golang based on photon

Signed-off-by: yminer <yminer@vmware.com>
goharbor · Jul 24, 2023 · 9478184 · 9478184
1 parent 9a63e80
commit 9478184
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 17 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-           go-version: 1.20.4
+           go-version: 1.20.6
         id: go
       - uses: actions/checkout@v3
         with:
@@ -97,7 +97,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.4
+          go-version: 1.20.6
         id: go
       - uses: actions/checkout@v3
         with:
@@ -152,7 +152,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.4
+          go-version: 1.20.6
         id: go
       - uses: actions/checkout@v3
         with:
@@ -207,7 +207,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.4
+          go-version: 1.20.6
         id: go
       - uses: actions/checkout@v3
         with:
@@ -260,7 +260,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.4
+          go-version: 1.20.6
         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.4
+          go-version: 1.20.6
         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.4
+          go-version: 1.20.6
         id: go
       - uses: actions/checkout@v3
         with:

diff --git 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.20.4     |
+|   2.8    |    1.20.6     |
 
 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
 

diff --git a/Makefile b/Makefile
@@ -145,7 +145,8 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.20.4
+GOVERSION=1.20.6
+GOBUILDIMAGE=goharbor/golang:$(GOVERSION)
 GOBUILDPATHINCONTAINER=/harbor
 
 # go build
@@ -457,7 +458,7 @@ package_online: update_prepare_version
 	@rm -rf $(HARBORPKG)
 	@echo "Done."
 
-package_offline: update_prepare_version compile build
+package_offline: build_golang update_prepare_version compile build
 
 	@echo "packing offline package ..."
 	@cp -r make $(HARBORPKG)
@@ -471,6 +472,11 @@ package_offline: update_prepare_version compile build
 	@rm -rf $(HARBORPKG)
 	@echo "Done."
 
+build_golang:
+	@echo "build goharbor/golang image"
+	$(DOCKERBUILD) --build-arg GOVERSION=$(GOVERSION) -f $(MAKEPATH)/photon/golang/Dockerfile -t $(GOBUILDIMAGE) .
+	@echo "Done."
+
 gosec:
 	#go get github.com/securego/gosec/cmd/gosec
 	#go get github.com/dghubble/sling
@@ -481,7 +487,7 @@ gosec:
 		$(GOPATH)/bin/gosec -fmt=json -out=harbor_gas_output.json -quiet ./... | true ; \
 	fi
 
-go_check: gen_apis mocks_check misspell commentfmt lint
+go_check: build_golang gen_apis mocks_check misspell commentfmt lint
 
 commentfmt:
 	@echo checking comment format...

diff --git a/make/photon/golang/Dockerfile b/make/photon/golang/Dockerfile
@@ -0,0 +1,19 @@
+FROM photon:4.0
+
+ARG GOVERSION
+
+ENV PATH /usr/local/go/bin:$PATH
+
+ENV GOLANG_VERSION ${GOVERSION}
+
+RUN set eux; \
+    url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \
+    wget -O go.tgz "$url"; \
+    tar -C /usr/local -xzf go.tgz; \
+    rm go.tgz; \
+    go version 
+
+ENV GOPATH /go
+ENV PATH $GOPATH/bin:$PATH
+RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 1777 "$GOPATH"
+WORKDIR $GOPATH
diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary
@@ -1,4 +1,6 @@
-FROM golang:1.20.4
+FROM goharbor/golang:1.20.6
+
+RUN tdnf install make -y
 
 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.4
+FROM goharbor/golang:1.20.6
 
 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.4..."
+echo "Building Trivy adapter binary based on goharbor/golang:1.20.6..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP
 

diff --git a/tests/ci/api_common_install.sh b/tests/ci/api_common_install.sh
@@ -55,7 +55,7 @@ then
     sed "s/# github_token: xxx/github_token: $GITHUB_TOKEN/" -i make/harbor.yml
 fi
 
-sudo make compile build prepare COMPILETAG=compile_golangimage GOBUILDTAGS="include_oss include_gcs" NOTARYFLAG=true TRIVYFLAG=true GEN_TLS=true PULL_BASE_FROM_DOCKERHUB=false
+sudo make build_golang compile build prepare COMPILETAG=compile_golangimage GOBUILDTAGS="include_oss include_gcs" NOTARYFLAG=true TRIVYFLAG=true GEN_TLS=true PULL_BASE_FROM_DOCKERHUB=false
 
 # set the debugging env
 echo "GC_TIME_WINDOW_HOURS=0" | sudo tee -a ./make/common/config/core/env

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.4 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=golang:1.20.4 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.20.6 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.20.6 COMPILETAG=compile_golangimage NOTARYFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
diff --git a/tools/spectral/Dockerfile b/tools/spectral/Dockerfile
@@ -1,6 +1,8 @@
 ARG GOLANG
 FROM ${GOLANG}
 
+RUN tdnf install libstdc++ -y
+
 ARG SPECTRAL_VERSION
 RUN curl -fsSL -o /usr/bin/spectral https://github.com/stoplightio/spectral/releases/download/$SPECTRAL_VERSION/spectral-linux && chmod +x /usr/bin/spectral