From 19910c2e9dc01506d43d48e5a4bef7dd56147518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vanzuita?= Date: Wed, 13 Apr 2022 22:18:31 +0200 Subject: [PATCH 1/4] update Go version, alpine, golangci and gotestsum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Vanzuita --- Dockerfile | 8 ++++---- vars.mk | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 709a5ab..401366b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,10 @@ # limitations under the License. -ARG GO_VERSION=1.16.3-alpine -ARG CLI_VERSION=20.10.2 -ARG ALPINE_VERSION=3.12.2 -ARG GOLANGCI_LINT_VERSION=v1.33.0-alpine +ARG GO_VERSION=1.18-alpine +ARG CLI_VERSION=20.10.12 +ARG ALPINE_VERSION=3.15.4 +ARG GOLANGCI_LINT_VERSION=v1.45.2-alpine #### # BUILDER diff --git a/vars.mk b/vars.mk index 5e34dc0..af589b5 100644 --- a/vars.mk +++ b/vars.mk @@ -13,11 +13,11 @@ # limitations under the License. # Pinned Versions -GO_VERSION=1.16.3-alpine -CLI_VERSION=20.10.2 -ALPINE_VERSION=3.12.2 -GOLANGCI_LINT_VERSION=v1.33.0-alpine -GOTESTSUM_VERSION=0.6.0 +GO_VERSION=1.18-alpine +CLI_VERSION=20.10.12 +ALPINE_VERSION=3.15.4 +GOLANGCI_LINT_VERSION=v1.45.2-alpine +GOTESTSUM_VERSION=1.8.0 GOOS?=$(shell go env GOOS) GOARCH?=$(shell go env GOARCH) From 820b0aca8718851c1c9688fb6e4c74beab49e459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vanzuita?= Date: Thu, 14 Apr 2022 21:26:11 +0200 Subject: [PATCH 2/4] call go install instead of go get to use ltag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Vanzuita --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 401366b..c713471 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ FROM builder AS validate-headers RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ - go get -u github.com/kunalkushwaha/ltag && ./scripts/validate/fileheader + go install github.com/kunalkushwaha/ltag@v0.2.3 && ./scripts/validate/fileheader + #### # CHECK GO MOD From 401204dba53cc00d8f55020625b9d98994a3db3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vanzuita?= Date: Thu, 14 Apr 2022 22:43:31 +0200 Subject: [PATCH 3/4] update docker cli MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Vanzuita --- Dockerfile | 2 +- vars.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c713471..f226a8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG GO_VERSION=1.18-alpine -ARG CLI_VERSION=20.10.12 +ARG CLI_VERSION=20.10.14 ARG ALPINE_VERSION=3.15.4 ARG GOLANGCI_LINT_VERSION=v1.45.2-alpine diff --git a/vars.mk b/vars.mk index af589b5..2d6d7a6 100644 --- a/vars.mk +++ b/vars.mk @@ -14,7 +14,7 @@ # Pinned Versions GO_VERSION=1.18-alpine -CLI_VERSION=20.10.12 +CLI_VERSION=20.10.14 ALPINE_VERSION=3.15.4 GOLANGCI_LINT_VERSION=v1.45.2-alpine GOTESTSUM_VERSION=1.8.0 From 3ebe0b9f64771799030a0049c5bb07592a9bcc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vanzuita?= Date: Thu, 14 Apr 2022 22:48:38 +0200 Subject: [PATCH 4/4] remove unecessary dockerfile arg definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Vanzuita --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f226a8c..ae448dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,10 @@ # limitations under the License. -ARG GO_VERSION=1.18-alpine -ARG CLI_VERSION=20.10.14 -ARG ALPINE_VERSION=3.15.4 -ARG GOLANGCI_LINT_VERSION=v1.45.2-alpine +ARG GO_VERSION +ARG CLI_VERSION +ARG ALPINE_VERSION +ARG GOLANGCI_LINT_VERSION #### # BUILDER