diff --git a/Makefile b/Makefile index 145ef223a5..9d529ea21f 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.5 +# golang:1.14.7 # compile_core, compile_jobservice: compile specific binary # # build: build Harbor docker images from photon baseimage @@ -154,7 +154,7 @@ GOINSTALL=$(GOCMD) install GOTEST=$(GOCMD) test GODEP=$(GOTEST) -i GOFMT=gofmt -w -GOBUILDIMAGE=golang:1.14.5 +GOBUILDIMAGE=golang:1.14.7 GOBUILDPATHINCONTAINER=/harbor # go build diff --git a/make/photon/chartserver/builder b/make/photon/chartserver/builder index f5e671bf50..22cc0937e0 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.5 github.com/helm/chartmuseum v0.12.0 cmd/chartmuseum chartm" + echo "e.g: builder golang:1.14.7 github.com/helm/chartmuseum v0.12.0 cmd/chartmuseum chartm" exit 1 } diff --git a/make/photon/clair-adapter/Dockerfile.binary b/make/photon/clair-adapter/Dockerfile.binary index 770d2c1283..11372ad227 100644 --- a/make/photon/clair-adapter/Dockerfile.binary +++ b/make/photon/clair-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.14.5 +FROM golang:1.14.7 ARG VERSION ARG COMMIT diff --git a/make/photon/clair-adapter/builder.sh b/make/photon/clair-adapter/builder.sh index 3e2e945724..59d1de308f 100755 --- 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; export COMMIT=$(git rev-list -1 HEAD); cd - -echo "Building Clair adapter binary based on golang:1.14.5..." +echo "Building Clair adapter binary based on golang:1.14.7..." cp Dockerfile.binary $TEMP docker build --build-arg VERSION=${VERSION} --build-arg COMMIT=${COMMIT} -f $TEMP/Dockerfile.binary -t clair-adapter-golang $TEMP diff --git a/make/photon/clair/Dockerfile.binary b/make/photon/clair/Dockerfile.binary index dca938071e..11fc1416eb 100644 --- a/make/photon/clair/Dockerfile.binary +++ b/make/photon/clair/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.14.5 +FROM golang:1.14.7 ADD . /go/src/github.com/quay/clair/ WORKDIR /go/src/github.com/quay/clair/ diff --git a/make/photon/clair/builder b/make/photon/clair/builder index 26a441d4c1..3fc72c636d 100755 --- 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.14.5' +echo 'build the clair binary bases on the golang:1.14.7' cp Dockerfile.binary $TEMP docker build -f $TEMP/Dockerfile.binary -t clair-golang $TEMP diff --git a/make/photon/notary/binary.Dockerfile b/make/photon/notary/binary.Dockerfile index 0f9f24a716..d2ed4f3dc4 100644 --- a/make/photon/notary/binary.Dockerfile +++ b/make/photon/notary/binary.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.5 +FROM golang:1.14.7 ARG NOTARY_VERSION ARG MIGRATE_VERSION diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary index 86d37efe6d..64acc7e2b5 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.14.5 +FROM golang:1.14.7 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 602f203f09..1755d8558e 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.14.5 +FROM golang:1.14.7 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 70d6f6663d..a18d257b14 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.5..." +echo "Building Trivy adapter binary based on golang:1.14.7..." 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 a72462357a..e2e2935195 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.5 COMPILETAG=compile_golangimage NOTARYFLAG=true CLAIRFLAG=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.5 COMPILETAG=compile_golangimage NOTARYFLAG=true CLAIRFLAG=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.14.7 COMPILETAG=compile_golangimage NOTARYFLAG=true CLAIRFLAG=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 CLAIRFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= diff --git a/tests/e2e-image/nightly/Dockerfile b/tests/e2e-image/nightly/Dockerfile index 82908b07a7..1602bb0f2b 100644 --- a/tests/e2e-image/nightly/Dockerfile +++ b/tests/e2e-image/nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11.2 +FROM golang:1.11.13 #docker build -f drone/Dockerfile -t goharbor/harbor-e2e-engine:2.4 . # V2.4.1: Upgrade docker engine diff --git a/tools/swagger/Dockerfile b/tools/swagger/Dockerfile index 6760acf14b..a20d48041b 100644 --- a/tools/swagger/Dockerfile +++ b/tools/swagger/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.5 +FROM golang:1.14.7 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