upgrade golang version to v1.13.8 (#11006)

The vesrion contains two security bug fix - CVE-2020-0601, CVE-2020-7919 More details, see the golang milestone: https://github.com/golang/go/issues?q=milestone%3AGo1.13.8+label%3ACherryPickApproved Signed-off-by: wang yan <wangyan@vmware.com>
2024-11-22 02:05:41 +01:00 · 2020-03-11 12:20:06 +08:00 · 2020-03-11 12:20:06 +08:00 · bd7940217a
commit bd7940217a
parent 41edfaf3a6
16 changed files with 22 additions and 22 deletions
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@ -30,7 +30,7 @@ jobs:
      - name: Set up Go 1.13
        uses: actions/setup-go@v1
        with:
-           go-version: 1.13.4
+           go-version: 1.13.8
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@0.0.1
@ -94,7 +94,7 @@ jobs:
      - name: Set up Go 1.13
        uses: actions/setup-go@v1
        with:
-          go-version: 1.13.4
+          go-version: 1.13.8
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@0.0.1
@ -154,7 +154,7 @@ jobs:
      - name: Set up Go 1.13
        uses: actions/setup-go@v1
        with:
-          go-version: 1.13.4
+          go-version: 1.13.8
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@0.0.1
@ -211,7 +211,7 @@ jobs:
      - name: Set up Go 1.13
        uses: actions/setup-go@v1
        with:
-          go-version: 1.13.4
+          go-version: 1.13.8
        id: go
      - name: setup Docker
        uses: docker-practice/actions-setup-docker@0.0.1
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -129,7 +129,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   1.8    |    1.11.2     |
 |   1.9    |    1.12.12    |
 |   1.10   |    1.12.12    |
-|   1.11   |    1.13.4     |
+|   1.11   |    1.13.8     |

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

--- a/4
+++ b/4
@ -9,7 +9,7 @@
 # compile_golangimage:
 #			compile from golang image
 #			for example: make compile_golangimage -e GOBUILDIMAGE= \
-#							golang:1.13.4
+#							golang:1.13.8
 # compile_core, compile_jobservice: compile specific binary
 #
 # build:	build Harbor docker images from photon baseimage
@ -140,7 +140,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.13.4
+GOBUILDIMAGE=golang:1.13.8
 GOBUILDPATHINCONTAINER=/harbor

 # go build
--- a/docs/1.10/build-customize-contribute/use-make.md
+++ b/docs/1.10/build-customize-contribute/use-make.md
@ -44,13 +44,13 @@ version				 | set harbor version
 ### Build and run harbor from source code

 ```sh
-make install GOBUILDIMAGE=golang:1.13.4 COMPILETAG=compile_golangimage NOTARYFLAG=true
+make install GOBUILDIMAGE=golang:1.13.8 COMPILETAG=compile_golangimage NOTARYFLAG=true
 ```

 ### Package offline installer

 ```sh
-make package_offline GOBUILDIMAGE=golang:1.13.4 COMPILETAG=compile_golangimage NOTARYFLAG=true
+make package_offline GOBUILDIMAGE=golang:1.13.8 COMPILETAG=compile_golangimage NOTARYFLAG=true
 ```

 ### Start harbor with notary
--- a/make/photon/chartserver/builder
+++ b/make/photon/chartserver/builder
@ -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.13.4 https://github.com/helm/chartmuseum v0.9.0 cmd/chartmuseum chartm"
+  echo "e.g: builder golang:1.13.8 https://github.com/helm/chartmuseum v0.9.0 cmd/chartmuseum chartm"
  exit 1
 }

--- a/make/photon/clair-adapter/Dockerfile.binary
+++ b/make/photon/clair-adapter/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.13.4
+FROM golang:1.13.8

 ADD .   /go/src/github.com/goharbor/harbor-scanner-clair/
 WORKDIR /go/src/github.com/goharbor/harbor-scanner-clair/
--- a/make/photon/clair-adapter/builder.sh
+++ b/make/photon/clair-adapter/builder.sh
@ -23,7 +23,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/clair-adapter.XXXXXX)
 git clone https://github.com/goharbor/harbor-scanner-clair.git $TEMP
 cd $TEMP; git checkout $VERSION; cd -

-echo "Building Clair adapter binary based on golang:1.13.4..."
+echo "Building Clair adapter binary based on golang:1.13.8..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t clair-adapter-golang $TEMP

--- a/make/photon/clair/Dockerfile.binary
+++ b/make/photon/clair/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.13.4
+FROM golang:1.13.8

 ADD .   /go/src/github.com/quay/clair/
 WORKDIR /go/src/github.com/quay/clair/
--- a/make/photon/clair/builder
+++ b/make/photon/clair/builder
@ -22,7 +22,7 @@ cur=$PWD
 TEMP=`mktemp -d /$TMPDIR/clair.XXXXXX`
 git clone -b $VERSION --single-branch https://github.com/quay/clair.git $TEMP

-echo 'build the clair binary bases on the golang:1.13.4'
+echo 'build the clair binary bases on the golang:1.13.8'
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t clair-golang $TEMP

--- a/make/photon/notary/binary.Dockerfile
+++ b/make/photon/notary/binary.Dockerfile
@ -1,4 +1,4 @@
-FROM golang:1.13.4
+FROM golang:1.13.8

 ARG NOTARY_VERSION
 ARG MIGRATE_VERSION
--- a/make/photon/registry/Dockerfile.binary
+++ b/make/photon/registry/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.13.4
+FROM golang:1.13.8

 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV BUILDTAGS include_oss include_gcs
--- a/make/photon/trivy-adapter/Dockerfile.binary
+++ b/make/photon/trivy-adapter/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.13.4
+FROM golang:1.13.8

 ADD .   /go/src/github.com/aquasecurity/harbor-scanner-trivy/
 WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/
--- 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.13.4..."
+echo "Building Trivy adapter binary based on golang:1.13.8..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP

--- a/tests/ci/api_common_install.sh
+++ b/tests/ci/api_common_install.sh
@ -26,5 +26,5 @@ sudo curl -o $DIR/../../tests/apitests/python/mariadb-4.3.1.tgz https://storage.
 sudo apt-get update && sudo apt-get install -y --no-install-recommends python-dev openjdk-7-jdk libssl-dev && sudo apt-get autoremove -y && sudo rm -rf /var/lib/apt/lists/*
 sudo wget https://bootstrap.pypa.io/get-pip.py && sudo python ./get-pip.py && sudo pip install --ignore-installed urllib3 chardet requests && sudo pip install robotframework==3.0.4 robotframework-httplibrary requests dbbot robotframework-pabot --upgrade
 sudo make swagger_client
-sudo make install GOBUILDIMAGE=golang:1.13.4 COMPILETAG=compile_golangimage CLARITYIMAGE=goharbor/harbor-clarity-ui-builder:1.6.0 NOTARYFLAG=true CLAIRFLAG=true TRIVYFLAG=true CHARTFLAG=true
+sudo make install GOBUILDIMAGE=golang:1.13.8 COMPILETAG=compile_golangimage CLARITYIMAGE=goharbor/harbor-clarity-ui-builder:1.6.0 NOTARYFLAG=true CLAIRFLAG=true TRIVYFLAG=true CHARTFLAG=true
 sleep 10
--- a/tests/ci/distro_installer.sh
+++ b/tests/ci/distro_installer.sh
@ -3,5 +3,5 @@ set -x

 set -e

-sudo make package_online VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.13.4 COMPILETAG=compile_golangimage NOTARYFLAG=true CLAIRFLAG=true MIGRATORFLAG=false CHARTFLAG=true HTTPPROXY=
-sudo make package_offline VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.13.4 COMPILETAG=compile_golangimage NOTARYFLAG=true CLAIRFLAG=true MIGRATORFLAG=false CHARTFLAG=true HTTPPROXY=
+sudo make package_online VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.13.8 COMPILETAG=compile_golangimage NOTARYFLAG=true CLAIRFLAG=true MIGRATORFLAG=false CHARTFLAG=true HTTPPROXY=
+sudo make package_offline VERSIONTAG=dev-travis PKGVERSIONTAG=dev-travis UIVERSIONTAG=dev-travis GOBUILDIMAGE=golang:1.13.8 COMPILETAG=compile_golangimage NOTARYFLAG=true CLAIRFLAG=true MIGRATORFLAG=false CHARTFLAG=true HTTPPROXY=
--- a/tools/swagger/Dockerfile
+++ b/tools/swagger/Dockerfile
@ -1,4 +1,4 @@
-FROM golang:1.13.4
+FROM golang:1.13.8

 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