From eb04a10eafdcffc5895097805c518ad129805fd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Feb 2023 20:35:01 +0000 Subject: [PATCH 1/3] Bump golang from 1.19-alpine to 1.20-alpine Bumps golang from 1.19-alpine to 1.20-alpine. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6549a76f4d2..9f0c2db8167 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM koalaman/shellcheck:stable as shellcheck FROM mvdan/shfmt:latest-alpine as shfmt FROM hadolint/hadolint:v2.12.0-alpine as hadolint FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker -FROM golang:1.19-alpine as revive +FROM golang:1.20-alpine as revive ## The golang image used as a builder is a temporary workaround ## for the released revive binaries not returning version numbers (devel). ## The install command should then be what is commented in the go.megalinter-descriptor.yml From 90451614519f993ce67092f891f16eed592336b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 26 Feb 2023 15:38:24 -0500 Subject: [PATCH 2/3] Update descriptor for revive (in go) to use a more general build image --- megalinter/descriptors/go.megalinter-descriptor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/megalinter/descriptors/go.megalinter-descriptor.yml b/megalinter/descriptors/go.megalinter-descriptor.yml index 8d8f934efe3..bdc1d19dc0a 100644 --- a/megalinter/descriptors/go.megalinter-descriptor.yml +++ b/megalinter/descriptors/go.megalinter-descriptor.yml @@ -80,7 +80,7 @@ linters: # - FROM ghcr.io/mgechev/revive:1.2.5 as revive # - COPY --link --from=revive /usr/bin/revive /usr/bin/revive - | - FROM golang:1.19-alpine as revive + FROM golang:1-alpine as revive ## The golang image used as a builder is a temporary workaround ## for the released revive binaries not returning version numbers (devel). ## The install command should then be what is commented in the go.megalinter-descriptor.yml From c1274a2f534d253690f30cac1213895ebe116a05 Mon Sep 17 00:00:00 2001 From: nvuillam Date: Thu, 2 Mar 2023 18:18:27 +0000 Subject: [PATCH 3/3] [build-command] Update generated files --- Dockerfile | 2 +- flavors/cupcake/Dockerfile | 2 +- flavors/go/Dockerfile | 2 +- linters/go_revive/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f0c2db8167..6d821b19cdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM koalaman/shellcheck:stable as shellcheck FROM mvdan/shfmt:latest-alpine as shfmt FROM hadolint/hadolint:v2.12.0-alpine as hadolint FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker -FROM golang:1.20-alpine as revive +FROM golang:1-alpine as revive ## The golang image used as a builder is a temporary workaround ## for the released revive binaries not returning version numbers (devel). ## The install command should then be what is commented in the go.megalinter-descriptor.yml diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile index 361dc6b459a..0460e6287ac 100644 --- a/flavors/cupcake/Dockerfile +++ b/flavors/cupcake/Dockerfile @@ -21,7 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck FROM mvdan/shfmt:latest-alpine as shfmt FROM hadolint/hadolint:v2.12.0-alpine as hadolint FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker -FROM golang:1.19-alpine as revive +FROM golang:1-alpine as revive ## The golang image used as a builder is a temporary workaround ## for the released revive binaries not returning version numbers (devel). ## The install command should then be what is commented in the go.megalinter-descriptor.yml diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile index dc228ac7474..753182ba3f7 100644 --- a/flavors/go/Dockerfile +++ b/flavors/go/Dockerfile @@ -21,7 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck FROM mvdan/shfmt:latest-alpine as shfmt FROM hadolint/hadolint:v2.12.0-alpine as hadolint FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker -FROM golang:1.19-alpine as revive +FROM golang:1-alpine as revive ## The golang image used as a builder is a temporary workaround ## for the released revive binaries not returning version numbers (devel). ## The install command should then be what is commented in the go.megalinter-descriptor.yml diff --git a/linters/go_revive/Dockerfile b/linters/go_revive/Dockerfile index 3ca98b6d4ee..4d0a826e8f2 100644 --- a/linters/go_revive/Dockerfile +++ b/linters/go_revive/Dockerfile @@ -11,7 +11,7 @@ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #FROM__START -FROM golang:1.19-alpine as revive +FROM golang:1-alpine as revive ## The golang image used as a builder is a temporary workaround ## for the released revive binaries not returning version numbers (devel). ## The install command should then be what is commented in the go.megalinter-descriptor.yml