Use a newer revive version

oxsecurity · Jan 5, 2024 · 5b8e30d · 5b8e30d
1 parent 5984ccd
commit 5b8e30d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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: