Upgrade tflint

- Upgrade tflint descriptor to use ghcr.io/terraform-linters/tflint docker image and initialize tflint
oxsecurity · Aug 13, 2021 · 7012b57 · 7012b57
1 parent 46d3efc
commit 7012b57
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 Note: Can be used with `nvuillam/mega-linter@insiders` in your GitHub Action mega-linter.yml file, or with `nvuillam/mega-linter@latest` docker image
 
+- Upgrade tflint descriptor to use ghcr.io/terraform-linters/tflint docker image and initialize tflint
+
 - Linter versions upgrades
   - [powershell](https://github.com/PowerShell/PSScriptAnalyzer) from 7.1.3 to **7.1.4** on 2021-08-13
   - [checkov](https://www.checkov.io/) from 2.0.347 to **2.0.348** on 2021-08-13

diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ FROM hadolint/hadolint:latest-alpine as hadolint
 FROM ghcr.io/assignuser/chktex-alpine:latest as chktex
 FROM yoheimuta/protolint:latest as protolint
 FROM ghcr.io/assignuser/lintr-lib:0.2.0 as lintr-lib
-FROM wata727/tflint:latest as tflint
+FROM ghcr.io/terraform-linters/tflint:latest as tflint
 FROM accurics/terrascan:latest as terrascan
 FROM alpine/terragrunt:latest as terragrunt
 #FROM__END
@@ -433,6 +433,7 @@ RUN curl -L -o ./install-misspell.sh https://git.io/misspell \
 
 # tflint installation
 COPY --from=tflint /usr/local/bin/tflint /usr/bin/
+RUN tflint --init
 
 # terrascan installation
 COPY --from=terrascan /go/bin/terrascan /usr/bin/

diff --git a/flavors/terraform/Dockerfile b/flavors/terraform/Dockerfile
@@ -13,7 +13,7 @@
 #FROM__START
 FROM hadolint/hadolint:latest-alpine as hadolint
 FROM yoheimuta/protolint:latest as protolint
-FROM wata727/tflint:latest as tflint
+FROM ghcr.io/terraform-linters/tflint:latest as tflint
 FROM accurics/terrascan:latest as terrascan
 FROM alpine/terragrunt:latest as terragrunt
 #FROM__END
@@ -195,6 +195,7 @@ RUN curl -L -o ./install-misspell.sh https://git.io/misspell \
 
 # tflint installation
 COPY --from=tflint /usr/local/bin/tflint /usr/bin/
+RUN tflint --init
 
 # terrascan installation
 COPY --from=terrascan /go/bin/terrascan /usr/bin/

diff --git a/megalinter/descriptors/terraform.megalinter-descriptor.yml b/megalinter/descriptors/terraform.megalinter-descriptor.yml
@@ -18,8 +18,9 @@ linters:
       - "tflint -c .tflint.hcl myfile.tf"
     install:
       dockerfile:
-        - FROM wata727/tflint:latest as tflint
+        - FROM ghcr.io/terraform-linters/tflint:latest as tflint
         - COPY --from=tflint /usr/local/bin/tflint /usr/bin/
+        - RUN tflint --init
   # TERRASCAN
   - linter_name: terrascan
     name: TERRAFORM_TERRASCAN