bump golang 1.19.8 on release-2.7.0 (#18496)

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

add GOFLAGS=-buildvcs=false
This commit is contained in:
MinerYang 2023-04-10 10:47:07 +08:00 committed by GitHub
parent df5f19f9cb
commit 67e5a24ff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 16 deletions

View File

@ -32,7 +32,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.4
go-version: 1.19.8
id: go
- uses: actions/checkout@v3
with:
@ -93,7 +93,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.4
go-version: 1.19.8
id: go
- uses: actions/checkout@v3
with:
@ -148,7 +148,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.4
go-version: 1.19.8
id: go
- uses: actions/checkout@v3
with:
@ -203,7 +203,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.4
go-version: 1.19.8
id: go
- uses: actions/checkout@v3
with:
@ -256,7 +256,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.4
go-version: 1.19.8
id: go
- uses: actions/checkout@v3
with:

View File

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

View File

@ -28,7 +28,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.4
go-version: 1.19.8
id: go
- uses: actions/checkout@v3
with:

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.5 | 1.17.7 |
| 2.6 | 1.18.6 |
| 2.7 | 1.19.4 |
| 2.7 | 1.19.8 |
Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.

View File

@ -155,14 +155,14 @@ GOINSTALL=$(GOCMD) install
GOTEST=$(GOCMD) test
GODEP=$(GOTEST) -i
GOFMT=gofmt -w
GOBUILDIMAGE=golang:1.19.4
GOBUILDIMAGE=golang:1.19.8
GOBUILDPATHINCONTAINER=/harbor
# go build
PKG_PATH=github.com/goharbor/harbor/src/pkg
GITCOMMIT := $(shell git rev-parse --short=8 HEAD)
RELEASEVERSION := $(shell cat VERSION)
GOFLAGS=
GOFLAGS=-buildvcs=false
GOTAGS=$(if $(GOBUILDTAGS),-tags "$(GOBUILDTAGS)",)
GOLDFLAGS=$(if $(GOBUILDLDFLAGS),--ldflags "-w -s $(GOBUILDLDFLAGS)",)
CORE_LDFLAGS=-X $(PKG_PATH)/version.GitCommit=$(GITCOMMIT) -X $(PKG_PATH)/version.ReleaseVersion=$(RELEASEVERSION)

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.19.4 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm"
echo "e.g: builder golang:1.19.8 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm"
exit 1
}

View File

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

View File

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

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.19.4..."
echo "Building Trivy adapter binary based on golang:1.19.8..."
cp Dockerfile.binary $TEMP
docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP

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.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.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.19.8 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.8 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false