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 golang 1.22.3 (#20433)

Browse Source 
* bump golang 1.22.3

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

* debug api_common_install.sh

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

* remove set DNS for docker v20

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

---------

Signed-off-by: yminer <yminer@vmware.com>
Co-authored-by: Wang Yan <wangyan@vmware.com>
This commit is contained in:
MinerYang 2024-05-16 14:32:59 +08:00 committed by GitHub
parent 2b4fe6ced7
commit 2da4d5883f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 35 additions and 32 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.22 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.22.2 go-version: 1.22.3
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -105,7 +105,7 @@ jobs:
- name: Set up Go 1.22 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.22.2 go-version: 1.22.3
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -160,7 +160,7 @@ jobs:
- name: Set up Go 1.22 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.22.2 go-version: 1.22.3
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -215,7 +215,7 @@ jobs:
- name: Set up Go 1.22 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.22.2 go-version: 1.22.3
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -268,7 +268,7 @@ jobs:
- name: Set up Go 1.22 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.22.2 go-version: 1.22.3
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.22 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.22.2 go-version: 1.22.3
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@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.22.2 go-version: 1.22.3
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.8 | 1.20.6 | | 2.8 | 1.20.6 |
| 2.9 | 1.21.3 | | 2.9 | 1.21.3 |
| 2.10 | 1.21.8 | | 2.10 | 1.21.8 |
| 2.11 | 1.22.2 | | 2.11 | 1.22.3 |
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.22.2 GOBUILDIMAGE=golang:1.22.3
GOBUILDPATHINCONTAINER=/harbor GOBUILDPATHINCONTAINER=/harbor
# go build # go build

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

@ -1,4 +1,4 @@
FROM golang:1.22.2 FROM golang:1.22.3
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.22.2 FROM golang:1.22.3
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.22.2..." echo "Building Trivy adapter binary based on golang:1.22.3..."
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

2
src/go.mod
View File

@ -1,6 +1,6 @@
module github.com/goharbor/harbor/src module github.com/goharbor/harbor/src
go 1.22.2 go 1.22.3
require ( require (
github.com/FZambia/sentinel v1.1.0 github.com/FZambia/sentinel v1.1.0

37
tests/ci/api_common_install.sh
View File

@ -24,24 +24,27 @@ python --version
# in container. So the current work round is read DNS server # in container. So the current work round is read DNS server
# from system and set the value in /etc/docker/daemon.json. # from system and set the value in /etc/docker/daemon.json.
ip addr # ip addr
docker_config_file="/etc/docker/daemon.json" # docker_config_file="/etc/docker/daemon.json"
dns_ip_string=$(netplan ip leases eth0 | grep -i dns | awk -F = '{print $2}' | tr " " "\n" | sed 's/,/","/g') # dns_ip_string=$(netplan ip leases eth0 | grep -i dns | awk -F = '{print $2}' | tr " " "\n" | sed 's/,/","/g')
dns=[\"${dns_ip_string}\"] # dns=[\"${dns_ip_string}\"]
echo dns=${dns} # echo dns=${dns}
cat $docker_config_file # cat $docker_config_file
if [ -f $docker_config_file ];then # if [ -f $docker_config_file ];then
if [ $(cat /etc/docker/daemon.json |grep \"dns\" |wc -l) -eq 0 ];then # if [ $(cat /etc/docker/daemon.json |grep \"dns\" |wc -l) -eq 0 ];then
sudo sed "s/}/,\n \"dns\": $dns\n}/" -i $docker_config_file # sudo sed "s/}/,\n \"dns\": $dns\n}/" -i $docker_config_file
fi # fi
else # else
echo "{\"dns\": $dns}" > $docker_config_file # echo "{\"dns\": $dns}" > $docker_config_file
fi # fi
cat $docker_config_file # cat $docker_config_file
sudo systemctl stop docker # sudo systemctl stop docker
sudo systemctl start docker # sudo systemctl start docker
sleep 2 # # debug
# sudo systemctl status docker.service
# sudo journalctl -xeu docker.service
# sleep 2
#------------------------------------------------------------# #------------------------------------------------------------#
sudo ./tests/hostcfg.sh sudo ./tests/hostcfg.sh

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.22.2 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.22.3 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.22.2 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.22.3 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false