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

)

Signed-off-by: yminer <yminer@vmware.com>

remove build_golang in ci script

fix typo

try to remove tdnf install make in registry/dockerfile.binary

optimize golang image

.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:

.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

.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:

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.
 

Makefile

@@ -145,7 +145,9 @@ 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)
+PUSHGOIMAGE=false
 GOBUILDPATHINCONTAINER=/harbor
 
 # go build
@@ -471,6 +473,16 @@ 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) .
+	@if [ "$(PUSHGOIMAGE)" = "true" ] ; then \
+	echo "push goharbor/golang image"; \
+	docker login -u $(REGISTRYUSER) -p $(REGISTRYPASSWORD) ; \
+	docker push $(GOBUILDIMAGE); \
+	fi; \
+
 gosec:
 	#go get github.com/securego/gosec/cmd/gosec
 	#go get github.com/dghubble/sling

make/photon/golang/Dockerfile

@@ -0,0 +1,21 @@
+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
+
+RUN tdnf install make libstdc++ -y

make/photon/registry/Dockerfile.binary

@@ -1,4 +1,4 @@
-FROM golang:1.20.4
+FROM goharbor/golang:1.20.6
 
 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV BUILDTAGS include_oss include_gcs

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/

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
 

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