diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index abdc9453f..fdcdf779b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -32,7 +32,7 @@ jobs: - name: Set up Go 1.14 uses: actions/setup-go@v1 with: - go-version: 1.14.7 + go-version: 1.15.6 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -98,7 +98,7 @@ jobs: - name: Set up Go 1.14 uses: actions/setup-go@v1 with: - go-version: 1.14.7 + go-version: 1.15.6 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -158,7 +158,7 @@ jobs: - name: Set up Go 1.14 uses: actions/setup-go@v1 with: - go-version: 1.14.7 + go-version: 1.15.6 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -218,7 +218,7 @@ jobs: - name: Set up Go 1.14 uses: actions/setup-go@v1 with: - go-version: 1.14.7 + go-version: 1.15.6 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -276,7 +276,7 @@ jobs: - name: Set up Go 1.14 uses: actions/setup-go@v1 with: - go-version: 1.14.7 + go-version: 1.15.6 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index fa152e8bb..cc88789ef 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Go 1.14 uses: actions/setup-go@v1 with: - go-version: 1.14.7 + go-version: 1.15.6 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/.github/workflows/conformance_test.yml b/.github/workflows/conformance_test.yml index a1ab01509..198f28325 100644 --- a/.github/workflows/conformance_test.yml +++ b/.github/workflows/conformance_test.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Go 1.14 uses: actions/setup-go@v1 with: - go-version: 1.14.7 + go-version: 1.15.6 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 80c78300a..2fdd84a78 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -158,7 +158,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo | 1.9 | 1.12.12 | | 1.10 | 1.12.12 | | 2.0 | 1.13.15 | -| 2.1 | 1.14.7 | +| 2.1 | 1.15.6 | Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions. diff --git a/Makefile b/Makefile index 909d83cb4..54704e8f7 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ # compile_golangimage: # compile from golang image # for example: make compile_golangimage -e GOBUILDIMAGE= \ -# golang:1.14.7 +# golang:1.15.6 # compile_core, compile_jobservice: compile specific binary # # build: build Harbor docker images from photon baseimage @@ -149,7 +149,7 @@ GOINSTALL=$(GOCMD) install GOTEST=$(GOCMD) test GODEP=$(GOTEST) -i GOFMT=gofmt -w -GOBUILDIMAGE=golang:1.14.7 +GOBUILDIMAGE=golang:1.15.6 GOBUILDPATHINCONTAINER=/harbor # go build diff --git a/make/photon/chartserver/builder b/make/photon/chartserver/builder index 22cc0937e..e9bf0f9e0 100755 --- a/make/photon/chartserver/builder +++ b/make/photon/chartserver/builder @@ -4,7 +4,7 @@ set +e usage(){ echo "Usage: builder " - echo "e.g: builder golang:1.14.7 github.com/helm/chartmuseum v0.12.0 cmd/chartmuseum chartm" + echo "e.g: builder golang:1.15.6 github.com/helm/chartmuseum v0.12.0 cmd/chartmuseum chartm" exit 1 } diff --git a/make/photon/notary/binary.Dockerfile b/make/photon/notary/binary.Dockerfile index d2ed4f3dc..ce991ebf5 100644 --- a/make/photon/notary/binary.Dockerfile +++ b/make/photon/notary/binary.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.7 +FROM golang:1.15.6 ARG NOTARY_VERSION ARG MIGRATE_VERSION diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary index 64acc7e2b..e740df6d8 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.14.7 +FROM golang:1.15.6 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution ENV BUILDTAGS include_oss include_gcs diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary index 1755d8558..7f3fad2ae 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.14.7 +FROM golang:1.15.6 ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/ WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/ diff --git a/make/photon/trivy-adapter/builder.sh b/make/photon/trivy-adapter/builder.sh index a18d257b1..8e73cec2b 100755 --- a/make/photon/trivy-adapter/builder.sh +++ b/make/photon/trivy-adapter/builder.sh @@ -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.14.7..." +echo "Building Trivy adapter binary based on golang:1.15.6..." cp Dockerfile.binary $TEMP docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP diff --git a/tests/ci/distro_installer.sh b/tests/ci/distro_installer.sh index 8ae8c63fa..89da63ca4 100755 --- a/tests/ci/distro_installer.sh +++ b/tests/ci/distro_installer.sh @@ -3,5 +3,5 @@ set -x set -e -sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.14.7 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= -sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.14.7 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= +sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.15.6 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= +sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.15.6 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= diff --git a/tools/swagger/Dockerfile b/tools/swagger/Dockerfile index a20d48041..9ceaa70a7 100644 --- a/tools/swagger/Dockerfile +++ b/tools/swagger/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.7 +FROM golang:1.15.6 ARG SWAGGER_VERSION RUN curl -fsSL -o /usr/bin/swagger https://github.com/go-swagger/go-swagger/releases/download/$SWAGGER_VERSION/swagger_linux_amd64 && chmod +x /usr/bin/swagger