From 329a317fdf04ce905b9e3bfcbefb7e3a21f04659 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Tue, 19 Jul 2022 13:54:33 -0700 Subject: [PATCH] Configure Hadolint in a single location for both hooks and CI --- .github/workflows/reusable-ci-backend.yml | 4 +--- .hadolint.yml | 8 ++++++++ .pre-commit-config.yaml | 7 ------- 3 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 .hadolint.yml diff --git a/.github/workflows/reusable-ci-backend.yml b/.github/workflows/reusable-ci-backend.yml index 2b54c6a8f..663a954b5 100644 --- a/.github/workflows/reusable-ci-backend.yml +++ b/.github/workflows/reusable-ci-backend.yml @@ -124,8 +124,6 @@ jobs: name: Checkout uses: actions/checkout@v3 - - uses: hadolint/hadolint-action@v2.0.0 + uses: hadolint/hadolint-action@v2.0 with: - failure-threshold: warning dockerfile: ${{ matrix.dockerfile }} - ignore: DL3008,DL3013,DL3003 diff --git a/.hadolint.yml b/.hadolint.yml new file mode 100644 index 000000000..e195127fe --- /dev/null +++ b/.hadolint.yml @@ -0,0 +1,8 @@ +failure-threshold: warning +ignored: + # https://github.com/hadolint/hadolint/wiki/DL3008 + - DL3008 + # https://github.com/hadolint/hadolint/wiki/DL3013 + - DL3013 + # https://github.com/hadolint/hadolint/wiki/DL3003 + - DL3003 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 46ad91ee8..70496a4d0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -74,13 +74,6 @@ repos: rev: v2.10.0 hooks: - id: hadolint - args: - - --ignore - - DL3008 # https://github.com/hadolint/hadolint/wiki/DL3008 (should probably do this at some point) - - --ignore - - DL3013 # https://github.com/hadolint/hadolint/wiki/DL3013 (should probably do this too at some point) - - --ignore - - DL3003 # https://github.com/hadolint/hadolint/wiki/DL3003 (seems excessive to use WORKDIR so much) # Shell script hooks - repo: https://github.com/lovesegfault/beautysh rev: v6.2.1