Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 10:15:35 +01:00
Code Issues Projects Releases Wiki Activity

bump up golang to 1.19.4 for main (#17997)

Browse Source 
bump up golang to 1.19.4 in main

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

Signed-off-by: yminer <yminer@vmware.com>
This commit is contained in:
MinerYang 2022-12-15 13:55:30 +08:00 committed by GitHub
parent 9674a51b83
commit d168f080ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ jobs:
- name: Set up Go 1.19 - name: Set up Go 1.19
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.19.3 go-version: 1.19.4
id: go id: go
- name: setup Docker - name: setup Docker
uses: docker-practice/actions-setup-docker@1.0.11 uses: docker-practice/actions-setup-docker@1.0.11
@ -98,7 +98,7 @@ jobs:
- name: Set up Go 1.19 - name: Set up Go 1.19
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.19.3 go-version: 1.19.4
id: go id: go
- name: setup Docker - name: setup Docker
uses: docker-practice/actions-setup-docker@1.0.11 uses: docker-practice/actions-setup-docker@1.0.11
@ -158,7 +158,7 @@ jobs:
- name: Set up Go 1.19 - name: Set up Go 1.19
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.19.3 go-version: 1.19.4
id: go id: go
- name: setup Docker - name: setup Docker
uses: docker-practice/actions-setup-docker@1.0.11 uses: docker-practice/actions-setup-docker@1.0.11
@ -218,7 +218,7 @@ jobs:
- name: Set up Go 1.19 - name: Set up Go 1.19
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.19.3 go-version: 1.19.4
id: go id: go
- name: setup Docker - name: setup Docker
uses: docker-practice/actions-setup-docker@1.0.11 uses: docker-practice/actions-setup-docker@1.0.11
@ -276,7 +276,7 @@ jobs:
- name: Set up Go 1.19 - name: Set up Go 1.19
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.19.3 go-version: 1.19.4
id: go id: go
- name: setup Docker - name: setup Docker
uses: docker-practice/actions-setup-docker@1.0.11 uses: docker-practice/actions-setup-docker@1.0.11

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

@ -26,7 +26,7 @@ jobs:
- name: Set up Go 1.19 - name: Set up Go 1.19
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.19.3 go-version: 1.19.4
id: go id: go
- name: Setup Docker - name: Setup Docker
uses: docker-practice/actions-setup-docker@1.0.11 uses: docker-practice/actions-setup-docker@1.0.11

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

@ -28,7 +28,7 @@ jobs:
- name: Set up Go 1.19 - name: Set up Go 1.19
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.19.3 go-version: 1.19.4
id: go id: go
- name: setup Docker - name: setup Docker
uses: docker-practice/actions-setup-docker@1.0.11 uses: docker-practice/actions-setup-docker@1.0.11

2
CONTRIBUTING.md
View File

@ -164,7 +164,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
| 2.4 | 1.17.7 | | 2.4 | 1.17.7 |
| 2.5 | 1.17.7 | | 2.5 | 1.17.7 |
| 2.6 | 1.18.6 | | 2.6 | 1.18.6 |
| 2.7 | 1.19.3 | | 2.7 | 1.19.4 |
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

@ -155,7 +155,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.19.3 GOBUILDIMAGE=golang:1.19.4
GOBUILDPATHINCONTAINER=/harbor GOBUILDPATHINCONTAINER=/harbor
# go build # go build

2
make/photon/chartserver/builder
View File

@ -4,7 +4,7 @@ set +e
usage(){ usage(){
echo "Usage: builder <golang image:version> <code path> <code release tag> <main.go path> <binary name>" echo "Usage: builder <golang image:version> <code path> <code release tag> <main.go path> <binary name>"
echo "e.g: builder golang:1.19.3 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm" echo "e.g: builder golang:1.19.4 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm"
exit 1 exit 1
} }

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

@ -1,4 +1,4 @@
FROM golang:1.19.3 FROM golang:1.19.4
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.19.3 FROM golang:1.19.4
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.19.3..." echo "Building Trivy adapter binary based on golang:1.19.4..."
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.19.3 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=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=golang:1.19.4 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=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.19.3 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=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.19.4 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false