Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bumpup golang to v1.18.5 (#17307) 

Signed-off-by: yminer <yminer@vmware.com>
This commit is contained in:
MinerYang 2022-08-03 17:44:03 +08:00 committed by GitHub
parent dac3c7b31d
commit 0fbff49eb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 16 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.18
uses: actions/setup-go@v1
with:
go-version: 1.18.4
go-version: 1.18.5
id: go
- name: setup Docker
uses: docker-practice/actions-setup-docker@0.0.1
@ -98,7 +98,7 @@ jobs:
- name: Set up Go 1.18
uses: actions/setup-go@v1
with:
go-version: 1.18.4
go-version: 1.18.5
id: go
- name: setup Docker
uses: docker-practice/actions-setup-docker@0.0.1
@ -158,7 +158,7 @@ jobs:
- name: Set up Go 1.18
uses: actions/setup-go@v1
with:
go-version: 1.18.4
go-version: 1.18.5
id: go
- name: setup Docker
uses: docker-practice/actions-setup-docker@0.0.1
@ -218,7 +218,7 @@ jobs:
- name: Set up Go 1.18
uses: actions/setup-go@v1
with:
go-version: 1.18.4
go-version: 1.18.5
id: go
- name: setup Docker
uses: docker-practice/actions-setup-docker@0.0.1
@ -276,7 +276,7 @@ jobs:
- name: Set up Go 1.18
uses: actions/setup-go@v1
with:
go-version: 1.18.4
go-version: 1.18.5
id: go
- name: setup Docker
uses: docker-practice/actions-setup-docker@0.0.1

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

@ -28,7 +28,7 @@ jobs:
- name: Set up Go 1.18
uses: actions/setup-go@v1
with:
go-version: 1.18.4
go-version: 1.18.5
id: go
- name: setup Docker
uses: docker-practice/actions-setup-docker@0.0.1

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

@ -28,7 +28,7 @@ jobs:
- name: Set up Go 1.18
uses: actions/setup-go@v1
with:
go-version: 1.18.4
go-version: 1.18.5
id: go
- name: setup Docker
uses: docker-practice/actions-setup-docker@0.0.1

2
CONTRIBUTING.md
View File

@ -163,7 +163,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
| 2.3 | 1.15.12 |
| 2.4 | 1.17.7 |
| 2.5 | 1.17.7 |
| 2.6 | 1.18.4 |
| 2.6 | 1.18.5 |
Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.

4
Makefile
View File

@ -9,7 +9,7 @@
# compile_golangimage:
# compile from golang image
# for example: make compile_golangimage -e GOBUILDIMAGE= \
# golang:1.18.4
# golang:1.18.5
# compile_core, compile_jobservice: compile specific binary
#
# build: build Harbor docker images from photon baseimage
@ -157,7 +157,7 @@ GOINSTALL=$(GOCMD) install
GOTEST=$(GOCMD) test
GODEP=$(GOTEST) -i
GOFMT=gofmt -w
GOBUILDIMAGE=golang:1.18.4
GOBUILDIMAGE=golang:1.18.5
GOBUILDPATHINCONTAINER=/harbor
# go build

2
make/photon/chartserver/builder
View File

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

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

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

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

@ -1,4 +1,4 @@
FROM golang:1.18.4
FROM golang:1.18.5
ADD . /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
cd $TEMP; git checkout $VERSION; cd -
echo "Building Trivy adapter binary based on golang:1.18.4..."
echo "Building Trivy adapter binary based on golang:1.18.5..."
cp Dockerfile.binary $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
sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.18.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.18.4 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.18.5 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.18.5 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false