Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-29 08:15:06 +02:00
Code Issues Projects Releases Wiki Activity

bump golang to 1.21.9 on release-2.8.0 (#20267)

Browse Source 
Signed-off-by: yminer <yminer@vmware.com>
This commit is contained in:
MinerYang 2024-04-12 14:21:37 +08:00 committed by GitHub
parent c91b654ca2
commit d75ff342f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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

@ -36,7 +36,7 @@ jobs:
- name: Set up Go 1.21 - name: Set up Go 1.21
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.21.7 go-version: 1.21.9
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -97,7 +97,7 @@ jobs:
- name: Set up Go 1.21 - name: Set up Go 1.21
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.21.7 go-version: 1.21.9
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -152,7 +152,7 @@ jobs:
- name: Set up Go 1.21 - name: Set up Go 1.21
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.21.7 go-version: 1.21.9
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -207,7 +207,7 @@ jobs:
- name: Set up Go 1.21 - name: Set up Go 1.21
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.21.7 go-version: 1.21.9
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -260,7 +260,7 @@ jobs:
- name: Set up Go 1.21 - name: Set up Go 1.21
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.21.7 go-version: 1.21.9
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.21 - name: Set up Go 1.21
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.21.7 go-version: 1.21.9
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.21 - name: Set up Go 1.21
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.21.7 go-version: 1.21.9
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

2
CONTRIBUTING.md
View File

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

@ -145,7 +145,7 @@ GOINSTALL=$(GOCMD) install
GOTEST=$(GOCMD) test GOTEST=$(GOCMD) test
GODEP=$(GOTEST) -i GODEP=$(GOTEST) -i
GOFMT=gofmt -w GOFMT=gofmt -w
GOVERSION=1.21.7 GOVERSION=1.21.9
GOBUILDIMAGE=goharbor/golang:$(GOVERSION) GOBUILDIMAGE=goharbor/golang:$(GOVERSION)
PUSHGOIMAGE=false PUSHGOIMAGE=false
GOBUILDPATHINCONTAINER=/harbor GOBUILDPATHINCONTAINER=/harbor

2
make/photon/golang/Dockerfile
View File

@ -12,7 +12,7 @@ ENV GOLANG_VERSION ${GOVERSION}
RUN set eux; \ RUN set eux; \
url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \ url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \
sha256="13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c"; \ sha256="f76194c2dc607e0df4ed2e7b825b5847cb37e34fc70d780e2f6c7e805634a7ea"; \
wget -O go.tgz.asc "$url.asc"; \ wget -O go.tgz.asc "$url.asc"; \
wget -O go.tgz "$url"; \ wget -O go.tgz "$url"; \
echo "$sha256 *go.tgz" | sha256sum -c -; \ echo "$sha256 *go.tgz" | sha256sum -c -; \

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

@ -1,4 +1,4 @@
FROM goharbor/golang:1.21.7 FROM goharbor/golang:1.21.9
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 goharbor/golang:1.21.7 FROM goharbor/golang:1.21.9
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 goharbor/golang:1.21.7..." echo "Building Trivy adapter binary based on goharbor/golang:1.21.9..."
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=goharbor/golang:1.21.7 COMPILETAG=compile_golangimage NOTARYFLAG=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=goharbor/golang:1.21.9 COMPILETAG=compile_golangimage NOTARYFLAG=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=goharbor/golang:1.21.7 COMPILETAG=compile_golangimage NOTARYFLAG=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=goharbor/golang:1.21.9 COMPILETAG=compile_golangimage NOTARYFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false