Merge branch 'main' into fix/skip-transaction-for-token-requests

.github/workflows/CI.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-           go-version: 1.20.7
+           go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -105,7 +105,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -160,7 +160,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -215,7 +215,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:
@@ -268,7 +268,7 @@ jobs:
       - name: Set up Go 1.20
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.7
+          go-version: 1.20.10
         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.7
+          go-version: 1.20.10
         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.7
+          go-version: 1.20.10
         id: go
       - uses: actions/checkout@v3
         with:

CONTRIBUTING.md

@@ -43,6 +43,8 @@ git fetch $USER
 ```
 **NOTES:** Note that GOPATH can be any directory, the example above uses $HOME/go. Change $USER above to your own GitHub username.
 
+### Build Project
+
 To build the project, please refer the [build](https://goharbor.io/docs/edge/build-customize-contribute/compile-guide/) guideline.
 
 ### Repository Structure
@@ -166,7 +168,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   2.6    |    1.18.6     |
 |   2.7    |    1.19.4     |
 |   2.8    |    1.20.6     |
-|   2.9    |    1.20.7     |
+|   2.9    |    1.20.10    |
 
 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
 

Makefile

@@ -104,8 +104,8 @@ PREPARE_VERSION_NAME=versions
 
 #versions
 REGISTRYVERSION=v2.8.2-patch-redis
-TRIVYVERSION=v0.44.0
-TRIVYADAPTERVERSION=v0.30.15
+TRIVYVERSION=v0.46.0
+TRIVYADAPTERVERSION=v0.30.17
 
 # version of registry for pulling the source code
 REGISTRY_SRC_TAG=v2.8.2
@@ -140,7 +140,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.20.7
+GOBUILDIMAGE=golang:1.20.10
 GOBUILDPATHINCONTAINER=/harbor
 
 # go build

make/migrations/postgresql/0130_2.10.0_schema.up.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS harbor_resource_label;

make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja

@@ -105,10 +105,10 @@ storage_service:
     {% elif key == 'redirect' %}
 #   # set disable to true when you want to disable registry redirect
   redirect:
-      {% if value.disabled is not none %}
-    disable: {{ value.disabled }}
+      {% if storage_service.redirect.disabled is defined %}
+    disable: {{ storage_service.redirect.disabled | lower}}
       {% else %}
-    disable: {{ value.disable }}
+    disable: {{ storage_service.redirect.disable  | lower}}
       {% endif %}
     {% else %}
 #   # storage backend, default is filesystem, options include filesystem, azure, gcs, s3, swift and oss

make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja

@@ -113,10 +113,10 @@ storage_service:
     {% elif key == 'redirect' %}
 #   # set disable to true when you want to disable registry redirect
   redirect:
-      {% if value.disabled is not none %}
-    disable: {{ value.disabled }}
+      {% if storage_service.redirect.disabled is defined %}
+    disable: {{ storage_service.redirect.disabled  | lower}}
       {% else %}
-    disable: {{ value.disable }}
+    disable: {{ storage_service.redirect.disable | lower}}
       {% endif %}
     {% else %}
 #   # storage backend, default is filesystem, options include filesystem, azure, gcs, s3, swift and oss

make/photon/registry/Dockerfile.binary

@@ -1,4 +1,4 @@
-FROM golang:1.20.7
+FROM golang:1.20.10
 
 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.7
+FROM golang:1.20.10
 
 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.7..."
+echo "Building Trivy adapter binary based on golang:1.20.10..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP
 

src/common/models/base.go

@@ -21,7 +21,6 @@ import (
 func init() {
 	orm.RegisterModel(
 		new(Role),
-		new(ResourceLabel),
 		new(OIDCUser),
 	)
 }