Merge pull request #109 from docker/bump-golang-1.15.0

Bumping golang to 1.15.0

Author: glours

.github/workflows/build-pr.yml

@@ -8,10 +8,10 @@ jobs:
     env:
       GO111MODULE: "on"
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.15
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.15
         id: go
 
       - name: Checkout code into the Go module directory
@@ -38,10 +38,10 @@ jobs:
       - name: Docker version
         run: docker version
 
-      - name: Set up Go 1.14
+      - name: Set up Go 1.15
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.15
         id: go
 
       - name: Checkout code into the Go module directory

.github/workflows/release-weekly-build.yml

@@ -18,10 +18,10 @@ jobs:
     env:
       GO111MODULE: "on"
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.15
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.15
         id: go
 
       - name: Checkout code into the Go module directory
@@ -53,10 +53,10 @@ jobs:
         # Only the CLI is needed to run docker-scan e2e
         run: brew install docker
 
-      - name: Set up Go 1.14
+      - name: Set up Go 1.15
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.15
         id: go
 
       - name: Checkout code into the Go module directory

Dockerfile

@@ -16,7 +16,7 @@
 #   limitations under the License.
 
 
-ARG GO_VERSION=1.14.6
+ARG GO_VERSION=1.15.0
 ARG CLI_VERSION=19.03.9
 ARG ALPINE_VERSION=3.12.0
 ARG GOLANGCI_LINT_VERSION=v1.27.0-alpine
@@ -90,7 +90,7 @@ COPY --from=cross-build /go/src/github.com/docker/scan-cli-plugin/dist /
 # GOTESTSUM
 ####
 FROM alpine:${ALPINE_VERSION} AS gotestsum
-ARG GOTESTSUM_VERSION=0.4.2
+ARG GOTESTSUM_VERSION=0.5.2
 
 RUN apk add -U --no-cache wget tar
 # install gotestsum

builder.Makefile

@@ -48,7 +48,8 @@ e2e:
 	mkdir -p docker-config/scan
 	mkdir -p docker-config/cli-plugins
 	cp ./bin/${PLATFORM_BINARY} docker-config/cli-plugins/${BINARY}
-	$(VARS) gotestsum ./e2e $(RUN_TEST) -- -ldflags=$(LDFLAGS)
+	# TODO: gotestsum doesn't forward ldflags to go test with golang 1.15.0, so moving back to go test temporarily
+	$(VARS) go test ./e2e $(RUN_TEST) -ldflags=$(LDFLAGS)
 
 .PHONY: test-unit
 test-unit:
@@ -75,4 +76,4 @@ download:
 	curl https://github.com/snyk/snyk/releases/download/v${SNYK_DESKTOP_VERSION}/${SNYK_DOWNLOAD_NAME} -L -s -S -o docker-config/snyk-desktop/${SNYK_BINARY}
 	chmod +x docker-config/snyk-desktop/${SNYK_BINARY}
 
-	GO111MODULE=on go get gotest.tools/gotestsum@v0.4.2
+	GO111MODULE=on go get gotest.tools/gotestsum@v${GOTESTSUM_VERSION}

go.mod

@@ -1,6 +1,6 @@
 module github.com/docker/scan-cli-plugin
 
-go 1.14
+go 1.15
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect

vars.mk

@@ -1,11 +1,11 @@
 # Pinned Versions
 SNYK_DESKTOP_VERSION=1.332.0
 SNYK_USER_VERSION=1.334.0
-GO_VERSION=1.14.6
+GO_VERSION=1.15.0
 CLI_VERSION=19.03.9
 ALPINE_VERSION=3.12.0
 GOLANGCI_LINT_VERSION=v1.27.0-alpine
-GOTESTSUM_VERSION=0.4.2
+GOTESTSUM_VERSION=0.5.2
 
 GOOS ?= $(shell go env GOOS)
 BINARY_EXT=