Skip to content

Commit

Permalink
bump goharbor/golang 1.19.13 on release-2.7.0 (#19324)
Browse files Browse the repository at this point in the history
bump golang 1.19.13 on release-2.7.0

Signed-off-by: yminer <yminer@vmware.com>
  • Loading branch information
MinerYang authored Sep 7, 2023
1 parent 3d6c706 commit c91e950
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 16 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.12
go-version: 1.19.13
id: go
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.12
go-version: 1.19.13
id: go
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.12
go-version: 1.19.13
id: go
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.12
go-version: 1.19.13
id: go
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.12
go-version: 1.19.13
id: go
- uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.12
go-version: 1.19.13
id: go
- name: Setup Docker
uses: docker-practice/actions-setup-docker@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conformance_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.19.12
go-version: 1.19.13
id: go
- uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.12 |
| 2.7 | 1.19.13 |

Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ GOINSTALL=$(GOCMD) install
GOTEST=$(GOCMD) test
GODEP=$(GOTEST) -i
GOFMT=gofmt -w
GOVERSION=1.19.12
GOVERSION=1.19.13
GOBUILDIMAGE=goharbor/golang:$(GOVERSION)
PUSHGOIMAGE=false
GOBUILDPATHINCONTAINER=/harbor
Expand Down
2 changes: 1 addition & 1 deletion make/photon/chartserver/builder
Original file line number Diff line number Diff line change
Expand Up @@ -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 goharbor/golang:1.19.12 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm"
echo "e.g: builder goharbor/golang:1.19.13 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm"
exit 1
}

Expand Down
3 changes: 2 additions & 1 deletion make/photon/golang/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ ENV PATH /usr/local/go/bin:$PATH
ENV GOLANG_VERSION ${GOVERSION}

# need to change sha256, for every specific golang version from https://github.com/docker-library/golang
# or get checksum from https://go.dev/dl/ directly
RUN set eux; \
url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \
sha256="48e4fcfb6abfdaa01aaf1429e43bdd49cea5e4687bd5f5b96df1e193fcfd3e7e"; \
sha256="4643d4c29c55f53fa0349367d7f1bb5ca554ea6ef528c146825b0f8464e2e668"; \
wget -O go.tgz.asc "$url.asc"; \
wget -O go.tgz "$url"; \
echo "$sha256 *go.tgz" | sha256sum -c -; \
Expand Down
2 changes: 1 addition & 1 deletion make/photon/registry/Dockerfile.binary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM goharbor/golang:1.19.12
FROM goharbor/golang:1.19.13

ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
ENV BUILDTAGS include_oss include_gcs
Expand Down
2 changes: 1 addition & 1 deletion make/photon/trivy-adapter/Dockerfile.binary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM goharbor/golang:1.19.12
FROM goharbor/golang:1.19.13

ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/
WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/
Expand Down
2 changes: 1 addition & 1 deletion make/photon/trivy-adapter/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 goharbor/golang:1.19.12..."
echo "Building Trivy adapter binary based on goharbor/golang:1.19.13..."
cp Dockerfile.binary $TEMP
docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP

Expand Down
4 changes: 2 additions & 2 deletions tests/ci/distro_installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=goharbor/golang:1.19.12 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=goharbor/golang:1.19.12 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=goharbor/golang:1.19.13 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=goharbor/golang:1.19.13 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false

0 comments on commit c91e950

Please sign in to comment.