From 7598520e446ebef06de2e622abe7983633c5dfec Mon Sep 17 00:00:00 2001 From: brycahta Date: Fri, 18 Mar 2022 14:07:57 -0500 Subject: [PATCH 1/2] align Dockerfile go versions with app --- test/license-test/Dockerfile | 2 +- test/readme-test/spellcheck-Dockerfile | 2 +- test/webhook-test-proxy/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/license-test/Dockerfile b/test/license-test/Dockerfile index 3d237306..9377f7af 100644 --- a/test/license-test/Dockerfile +++ b/test/license-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1 +FROM golang:1.16 WORKDIR /app diff --git a/test/readme-test/spellcheck-Dockerfile b/test/readme-test/spellcheck-Dockerfile index cbcb14c4..3b2af91a 100644 --- a/test/readme-test/spellcheck-Dockerfile +++ b/test/readme-test/spellcheck-Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1 +FROM golang:1.16 RUN go get -u github.com/client9/misspell/cmd/misspell diff --git a/test/webhook-test-proxy/Dockerfile b/test/webhook-test-proxy/Dockerfile index f707c0c4..e5699261 100644 --- a/test/webhook-test-proxy/Dockerfile +++ b/test/webhook-test-proxy/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1-alpine as builder +FROM golang:1.16-alpine as builder ## GOLANG env ARG GOPROXY="https://proxy.golang.org|direct" From aac3eab47a091c53df699cb2d74d6f9ce404e29f Mon Sep 17 00:00:00 2001 From: brycahta Date: Fri, 18 Mar 2022 14:12:28 -0500 Subject: [PATCH 2/2] replace go get with go install --- test/license-test/Dockerfile | 2 +- test/license-test/gen-license-report.sh | 2 +- test/readme-test/spellcheck-Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/license-test/Dockerfile b/test/license-test/Dockerfile index 9377f7af..b9f01d0b 100644 --- a/test/license-test/Dockerfile +++ b/test/license-test/Dockerfile @@ -4,6 +4,6 @@ WORKDIR /app COPY license-config.hcl . ARG GOPROXY="https://proxy.golang.org,direct" -RUN GO111MODULE=on go get github.com/mitchellh/golicense +RUN GO111MODULE=on go install github.com/mitchellh/golicense@v0.2.0 CMD $GOPATH/bin/golicense diff --git a/test/license-test/gen-license-report.sh b/test/license-test/gen-license-report.sh index 0d139fc9..27a88aaf 100755 --- a/test/license-test/gen-license-report.sh +++ b/test/license-test/gen-license-report.sh @@ -7,7 +7,7 @@ mkdir -p $BUILD_DIR GOBIN=$(go env GOPATH | sed 's+:+/bin+g')/bin export PATH="$PATH:$GOBIN" -go get github.com/mitchellh/golicense +go install github.com/mitchellh/golicense@v0.2.0 go build -o $BUILD_DIR/nth $SCRIPTPATH/../../. golicense -out-xlsx=$BUILD_DIR/report.xlsx $SCRIPTPATH/license-config.hcl $BUILD_DIR/nth diff --git a/test/readme-test/spellcheck-Dockerfile b/test/readme-test/spellcheck-Dockerfile index 3b2af91a..cd36641b 100644 --- a/test/readme-test/spellcheck-Dockerfile +++ b/test/readme-test/spellcheck-Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.16 -RUN go get -u github.com/client9/misspell/cmd/misspell +RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4 CMD [ "/go/bin/misspell" ] \ No newline at end of file