From 5b8e30dd86de41224a9c28d550e59878340c98d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20Dom=C3=ADnguez=20V=C3=A1zquez?= Date: Fri, 5 Jan 2024 09:54:21 +0100 Subject: [PATCH] Use a newer revive version --- Dockerfile | 7 +------ flavors/cupcake/Dockerfile | 7 +------ flavors/go/Dockerfile | 7 +------ linters/go_revive/Dockerfile | 7 +------ megalinter/descriptors/go.megalinter-descriptor.yml | 10 +--------- 5 files changed, 5 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b719106587..a7370c6a114 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,12 +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.2 as editorconfig-checker -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 -RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest - +FROM ghcr.io/mgechev/revive:1.3.5 as revive FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform FROM ghcr.io/assignuser/chktex-alpine:latest as chktex FROM mrtazz/checkmake:latest as checkmake diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile index 5f39372aa6b..500143e9c2f 100644 --- a/flavors/cupcake/Dockerfile +++ b/flavors/cupcake/Dockerfile @@ -21,12 +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.2 as editorconfig-checker -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 -RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest - +FROM ghcr.io/mgechev/revive:1.3.5 as revive FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform FROM mrtazz/checkmake:latest as checkmake FROM ghcr.io/phpstan/phpstan:latest-php8.1 as phpstan diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile index 0b38be56cd6..b128a13b00b 100644 --- a/flavors/go/Dockerfile +++ b/flavors/go/Dockerfile @@ -21,12 +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.2 as editorconfig-checker -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 -RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest - +FROM ghcr.io/mgechev/revive:1.3.5 as revive FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform FROM mrtazz/checkmake:latest as checkmake FROM yoheimuta/protolint:latest as protolint diff --git a/linters/go_revive/Dockerfile b/linters/go_revive/Dockerfile index e06d4f79e9b..70fc9886661 100644 --- a/linters/go_revive/Dockerfile +++ b/linters/go_revive/Dockerfile @@ -11,12 +11,7 @@ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #FROM__START -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 -RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest - +FROM ghcr.io/mgechev/revive:1.3.5 as revive #FROM__END ################## diff --git a/megalinter/descriptors/go.megalinter-descriptor.yml b/megalinter/descriptors/go.megalinter-descriptor.yml index 5f1024eb27c..c5e5de9019e 100644 --- a/megalinter/descriptors/go.megalinter-descriptor.yml +++ b/megalinter/descriptors/go.megalinter-descriptor.yml @@ -77,15 +77,7 @@ linters: - "revive -config myfile.go" install: dockerfile: - ## Until "FROM ghcr.io/mgechev/revive:1.2.5 as revive" is available, use - # - FROM ghcr.io/mgechev/revive:1.2.5 as revive - # - COPY --link --from=revive /usr/bin/revive /usr/bin/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 - RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest + - FROM ghcr.io/mgechev/revive:1.3.5 as revive - COPY --link --from=revive /usr/bin/revive /usr/bin/revive ide: atom: