chore: Add hadolint check for Dockerfiles (#322)

Co-authored-by: Balazs Hamorszky <balihb@gmail.com>

.github/CONTRIBUTING.md

@@ -72,8 +72,8 @@ sudo apt install -y datamash
 ### Run via Docker
 
 ```bash
-# Build `pre-commit` image
+# Build `pre-commit-terraform` image
-docker build -t pre-commit --build-arg INSTALL_ALL=true .
+docker build -t pre-commit-terraform --build-arg INSTALL_ALL=true .
 # Build test image
 docker build -t pre-commit-tests tests/
 # Run

.github/workflows/pre-commit.yaml

@@ -25,19 +25,32 @@ jobs:
     - name: Install shellcheck
       run: |
         sudo apt update && sudo apt install shellcheck
+
+    - name: Install hadolint
+      run: |
+        curl -L "$(curl -s https://api.github.com/repos/hadolint/hadolint/releases/latest | grep -o -E -m 1 "https://.+?/hadolint-Linux-x86_64")" > hadolint \
+        && chmod +x hadolint && sudo mv hadolint /usr/bin/
     # Need to success pre-commit fix push
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.sha }}
-
+    # Skip terraform_tflint which interferes to commit pre-commit auto-fixes
     - uses: actions/setup-python@v2
       with:
         python-version: '3.9'
     - name: Execute pre-commit
       uses: pre-commit/action@v2.0.0
       env:
-        SKIP: no-commit-to-branch
+        SKIP: no-commit-to-branch,hadolint
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         extra_args: --color=always --show-diff-on-failure --files ${{ steps.file_changes.outputs.files }}
+    # Run only skipped checks
+    - name: Execute pre-commit check that have no auto-fixes
+      if: always()
+      uses: pre-commit/action@v2.0.0
+      env:
+        SKIP: check-added-large-files,check-merge-conflict,check-vcs-permalinks,forbid-new-submodules,no-commit-to-branch,end-of-file-fixer,trailing-whitespace,check-yaml,check-merge-conflict,check-executables-have-shebangs,check-case-conflict,mixed-line-ending,detect-aws-credentials,detect-private-key,shfmt,shellcheck
+      with:
+        extra_args: --color=always --show-diff-on-failure --files ${{ steps.file_changes.outputs.files }}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.0.1
+  rev: v4.1.0
   hooks:
     # Git style
     - id: check-added-large-files
@@ -34,3 +34,18 @@ repos:
     - id: shfmt
       args: ['-l', '-i', '2', '-ci', '-sr', '-w']
     - id: shellcheck
+
+# Dockerfile linter
+- repo: https://github.com/hadolint/hadolint
+  rev: v2.8.0
+  hooks:
+    - id: hadolint
+      args: [
+        '--ignore', 'DL3027', # Do not use apt
+        '--ignore', 'DL3007', # Using latest
+        '--ignore', 'DL4006', # Not related to alpine
+        '--ignore', 'SC1091', # Useless check
+        '--ignore', 'SC2015', # Useless check
+        '--ignore', 'SC3037', # Not related to alpine
+        '--ignore', 'DL3013', # Pin versions in pip
+      ]

Dockerfile

@@ -1,14 +1,14 @@
-ARG TAG=3.9.7-alpine3.14
+ARG TAG=3.10.1-alpine3.15
 FROM python:${TAG} as builder
 
 WORKDIR /bin_dir
 
 RUN apk add --no-cache \
     # Builder deps
-    curl \
+    curl=~7 \
-    unzip && \
+    unzip=~6 && \
     # Upgrade pip for be able get latest Checkov
-    python3 -m pip install --upgrade pip
+    python3 -m pip install --no-cache-dir --upgrade pip
 
 ARG PRE_COMMIT_VERSION=${PRE_COMMIT_VERSION:-latest}
 ARG TERRAFORM_VERSION=${TERRAFORM_VERSION:-latest}
@@ -57,7 +57,7 @@ RUN if [ "$INSTALL_ALL" != "false" ]; then \
 RUN . /.env && \
     if [ "$CHECKOV_VERSION" != "false" ]; then \
     ( \
-        apk add --no-cache gcc libffi-dev musl-dev; \
+        apk add --no-cache gcc=~10 libffi-dev=~3 musl-dev=~1; \
         [ "$CHECKOV_VERSION" = "latest" ] && pip3 install --no-cache-dir checkov \
         || pip3 install --no-cache-dir checkov==${CHECKOV_VERSION}; \
         apk del gcc libffi-dev musl-dev \
@@ -146,9 +146,9 @@ FROM python:${TAG}
 
 RUN apk add --no-cache \
     # pre-commit deps
-    git \
+    git=~2 \
     # All hooks deps
-    bash
+    bash=~5
 
 # Copy tools
 COPY --from=builder \
@@ -159,16 +159,16 @@ COPY --from=builder \
     /usr/local/bin/checkov* \
         /usr/bin/
 # Copy pre-commit packages
-COPY --from=builder /usr/local/lib/python3.9/site-packages/ /usr/local/lib/python3.9/site-packages/
+COPY --from=builder /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/site-packages/
 # Copy terrascan policies
 COPY --from=builder /root/ /root/
 
 # Install hooks extra deps
 RUN if [ "$(grep -o '^terraform-docs SKIPPED$' /usr/bin/tools_versions_info)" = "" ]; then \
-        apk add --no-cache perl \
+        apk add --no-cache perl=~5 \
     ; fi && \
     if [ "$(grep -o '^infracost SKIPPED$' /usr/bin/tools_versions_info)" = "" ]; then \
-        apk add --no-cache jq \
+        apk add --no-cache jq=~1 \
     ; fi
 
 ENV PRE_COMMIT_COLOR=${PRE_COMMIT_COLOR:-always}

hooks/infracost_breakdown.sh

@@ -73,8 +73,8 @@ function infracost_breakdown_ {
     }; then
       check="${check:1:-1}"
     fi
-    # shellcheck disable=SC2207 # Can't find working `read` command
+
-    operations=($(echo "$check" | grep -oE '[!<>=]{1,2}'))
+    mapfile -t operations < <(echo "$check" | grep -oE '[!<>=]{1,2}')
     # Get the very last operator, that is used in comparison inside `jq` query.
     # From the example below we need to pick the `>` which is in between `add` and `1000`,
     # but not the `!=`, which goes earlier in the `jq` expression

tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM pre-commit
+FROM pre-commit-terraform:latest
 
 RUN apt update && \
     apt install -y \