Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-13 05:54:47 +01:00
Code Issues Projects Releases Wiki Activity

[cherry-pick]bump golang to 1.20.10 (#19431)

Browse Source 
Signed-off-by: yminer <yminer@vmware.com>
This commit is contained in:
MinerYang 2023-10-11 13:53:46 +08:00 committed by GitHub
parent 82c24eee5a
commit 6cdcb9663d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/CI.yml vendored
View File

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

2
.github/workflows/build-package.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- name: Set up Go 1.20 - name: Set up Go 1.20
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.20.7 go-version: 1.20.10
id: go id: go
- name: Setup Docker - name: Setup Docker
uses: docker-practice/actions-setup-docker@master uses: docker-practice/actions-setup-docker@master

2
.github/workflows/conformance_test.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
- name: Set up Go 1.20 - name: Set up Go 1.20
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.20.7 go-version: 1.20.10
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

2
CONTRIBUTING.md
View File

@ -166,7 +166,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
| 2.6 | 1.18.6 | | 2.6 | 1.18.6 |
| 2.7 | 1.19.4 | | 2.7 | 1.19.4 |
| 2.8 | 1.20.6 | | 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. Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.

2
Makefile
View File

@ -140,7 +140,7 @@ GOINSTALL=$(GOCMD) install
GOTEST=$(GOCMD) test GOTEST=$(GOCMD) test
GODEP=$(GOTEST) -i GODEP=$(GOTEST) -i
GOFMT=gofmt -w GOFMT=gofmt -w
GOBUILDIMAGE=golang:1.20.7 GOBUILDIMAGE=golang:1.20.10
GOBUILDPATHINCONTAINER=/harbor GOBUILDPATHINCONTAINER=/harbor
# go build # go build

2
make/photon/registry/Dockerfile.binary
View File

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

2
make/photon/trivy-adapter/Dockerfile.binary
View File

@ -1,4 +1,4 @@
FROM golang:1.20.7 FROM golang:1.20.10
ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/ ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/
WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/ WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/

2
make/photon/trivy-adapter/builder.sh
View File

@ -19,7 +19,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX)
git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP
cd $TEMP; git checkout $VERSION; cd - 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 cp Dockerfile.binary $TEMP
docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP

4
tests/ci/distro_installer.sh
View File

@ -3,5 +3,5 @@ set -x
set -e set -e
sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.20.7 COMPILETAG=compile_golangimage 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.20.10 COMPILETAG=compile_golangimage 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.7 COMPILETAG=compile_golangimage 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.10 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false