Merge remote-tracking branch 'upstream/main'

.buildbaselog

@@ -8,5 +8,8 @@
 *   Add date here... Add signature here...
 -   Add your reason here...
 
+*   Sept 23 2021 <jiaoya@vmware.com>
+-   Refresh base image
+
 *   Jul 15 2021 <danfengl@vmware.com>
 -   Create this file to trigger build base action in buld-package workflow 

.github/workflows/CI.yml

@@ -29,10 +29,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.16
+      - name: Set up Go 1.17
         uses: actions/setup-go@v1
         with:
-           go-version: 1.16.5
+           go-version: 1.17.2
         id: go
       - name: setup Docker
         uses: docker-practice/actions-setup-docker@0.0.1
@@ -95,10 +95,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.16
+      - name: Set up Go 1.17
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.5
+          go-version: 1.17.2
         id: go
       - name: setup Docker
         uses: docker-practice/actions-setup-docker@0.0.1
@@ -155,10 +155,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.16
+      - name: Set up Go 1.17
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.5
+          go-version: 1.17.2
         id: go
       - name: setup Docker
         uses: docker-practice/actions-setup-docker@0.0.1
@@ -215,10 +215,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.16
+      - name: Set up Go 1.17
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.5
+          go-version: 1.17.2
         id: go
       - name: setup Docker
         uses: docker-practice/actions-setup-docker@0.0.1
@@ -273,10 +273,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.16
+      - name: Set up Go 1.17
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.5
+          go-version: 1.17.2
         id: go
       - name: setup Docker
         uses: docker-practice/actions-setup-docker@0.0.1

.github/workflows/build-package.yml

@@ -26,10 +26,10 @@ jobs:
           service_account_key: ${{ secrets.GCP_SA_KEY }}
           export_default_credentials: true
       - run: gcloud info
-      - name: Set up Go 1.16
+      - name: Set up Go 1.17
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.5
+          go-version: 1.17.2
         id: go
       - name: setup Docker
         uses: docker-practice/actions-setup-docker@0.0.1

.github/workflows/conformance_test.yml

@@ -26,10 +26,10 @@ jobs:
           service_account_key: ${{ secrets.GCP_SA_KEY }}
           export_default_credentials: true
       - run: gcloud info
-      - name: Set up Go 1.16
+      - name: Set up Go 1.17
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.5
+          go-version: 1.17.2
         id: go
       - name: setup Docker
         uses: docker-practice/actions-setup-docker@0.0.1

CONTRIBUTING.md

@@ -161,7 +161,8 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   2.1    |    1.14.13    |
 |   2.2    |    1.15.6     |
 |   2.3    |    1.15.12    |
-|   2.4    |    1.16.5     |
+|   2.4    |    1.16.7     |
+|   2.5    |    1.17.2     |
 
 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
 

Makefile

@@ -9,7 +9,7 @@
 # compile_golangimage:
 #			compile from golang image
 #			for example: make compile_golangimage -e GOBUILDIMAGE= \
-#							golang:1.16.5
+#							golang:1.17.2
 # compile_core, compile_jobservice: compile specific binary
 #
 # build:	build Harbor docker images from photon baseimage
@@ -110,8 +110,8 @@ PREPARE_VERSION_NAME=versions
 REGISTRYVERSION=v2.7.1-patch-2819-2553-redis
 NOTARYVERSION=v0.6.1
 NOTARYMIGRATEVERSION=v4.11.0
-TRIVYVERSION=v0.17.2
-TRIVYADAPTERVERSION=v0.19.0
+TRIVYVERSION=v0.20.1
+TRIVYADAPTERVERSION=v0.24.0
 
 # version of chartmuseum for pulling the source code
 CHARTMUSEUM_SRC_TAG=v0.13.1
@@ -156,7 +156,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.16.5
+GOBUILDIMAGE=golang:1.17.2
 GOBUILDPATHINCONTAINER=/harbor
 
 # go build
@@ -446,7 +446,7 @@ build_base_docker:
 	if [ -n "$(REGISTRYUSER)" ] && [ -n "$(REGISTRYPASSWORD)" ] ; then \
 		docker login -u $(REGISTRYUSER) -p $(REGISTRYPASSWORD) ; \
 	else \
-		echo "No docker credentials provided, please make sure enough priviledges to access docker hub!" ; \
+		echo "No docker credentials provided, please make sure enough privileges to access docker hub!" ; \
 	fi
 	@for name in $(BUILDBASETARGET); do \
 		echo $$name ; \

VERSION

@@ -1 +1 @@
-v2.4.0
+v2.5.0