Feat: Update CI (#146)

* feat: update hadolint-action version this comes with some improvements and a new hadolint version * fix: use ubuntu-24.04 as image use explicitly tagged image instead of ubuntu-latest, as that may be changed and therefore potentially make the ci fail without any changes and only the passing of time * ci: make checks into errors instead of warnings skip the check SecretsUsedInArgOrEnv, since it is a false positive in all cases in this repo * fix: fix LegacyKeyValueFormat checks in docker files
haskell · Dec 18, 2024 · 018abed · 018abed
1 parent fb09947
commit 018abed
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 42 deletions.
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -19,7 +19,7 @@ concurrency:
 jobs:
   build-smoke-test:
     timeout-minutes: 30
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: ${{ matrix.ghc }}-${{ matrix.deb }}
     strategy:
       fail-fast: false
@@ -68,7 +68,8 @@ jobs:
           command: |
             docker build --pull \
               -t haskell:${{ matrix.ghc }}-${{ matrix.deb }} \
-              ${{ matrix.ghc_minor }}/${{ matrix.deb }}
+              ${{ matrix.ghc_minor }}/${{ matrix.deb }} \
+              --build-arg "BUILDKIT_DOCKERFILE_CHECK=skip=SecretsUsedInArgOrEnv;error=true"
       - uses: actions/checkout@v4
         with:
           repository: docker-library/official-images
@@ -78,7 +79,7 @@ jobs:
 
   emulated-architecture-tests:
     timeout-minutes: 60
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: ${{ matrix.arch }}-${{ matrix.ghc }}-${{ matrix.deb }}
     strategy:
       fail-fast: false
@@ -135,7 +136,8 @@ jobs:
             docker build --pull --progress=plain \
               --platform "linux/${{ matrix.docker_platform }}" \
               -t haskell:${{ matrix.ghc }}-${{ matrix.deb }} \
-              ${{ matrix.ghc_minor }}/${{ matrix.deb }}
+              ${{ matrix.ghc_minor }}/${{ matrix.deb }} \
+              --build-arg "BUILDKIT_DOCKERFILE_CHECK=skip=SecretsUsedInArgOrEnv;error=true"
             echo 'testing..'
             docker run \
               --platform "linux/${{ matrix.docker_platform }}" \

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,9 +10,9 @@ on:
 
 jobs:
   hadolint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
-    - uses: hadolint/hadolint-action@v1.6.0
+    - uses: hadolint/hadolint-action@v3.1.0
       with:
         recursive: true
diff --git a/9.0/buster/Dockerfile b/9.0/buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM buildpack-deps:buster
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # additional haskell specific deps
 RUN apt-get update && \
@@ -132,6 +132,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.0/slim-buster/Dockerfile b/9.0/slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -148,6 +148,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.10/bullseye/Dockerfile b/9.10/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:bullseye
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -129,6 +129,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.10/buster/Dockerfile b/9.10/buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -129,6 +129,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.10/slim-bullseye/Dockerfile b/9.10/slim-bullseye/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:bullseye-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -129,6 +129,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.10/slim-buster/Dockerfile b/9.10/slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -131,6 +131,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.2/buster/Dockerfile b/9.2/buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM buildpack-deps:buster
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # additional haskell specific deps
 RUN apt-get update && \
@@ -115,6 +115,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.2/slim-buster/Dockerfile b/9.2/slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -131,6 +131,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.4/buster/Dockerfile b/9.4/buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM buildpack-deps:buster
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # additional haskell specific deps
 RUN apt-get update && \
@@ -115,6 +115,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.4/slim-buster/Dockerfile b/9.4/slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -131,6 +131,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.6/bullseye/Dockerfile b/9.6/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:bullseye
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -132,6 +132,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.6/buster/Dockerfile b/9.6/buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM buildpack-deps:buster
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # additional haskell specific deps
 RUN apt-get update && \
@@ -115,6 +115,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.6/slim-bullseye/Dockerfile b/9.6/slim-bullseye/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:bullseye-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -134,6 +134,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.6/slim-buster/Dockerfile b/9.6/slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -131,6 +131,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.8/bullseye/Dockerfile b/9.8/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:bullseye
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -129,6 +129,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.8/buster/Dockerfile b/9.8/buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM buildpack-deps:buster
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # additional haskell specific deps
 RUN apt-get update && \
@@ -115,6 +115,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.8/slim-bullseye/Dockerfile b/9.8/slim-bullseye/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:bullseye-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -129,6 +129,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]
diff --git a/9.8/slim-buster/Dockerfile b/9.8/slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 
 # common haskell + stack dependencies
 RUN apt-get update && \
@@ -131,6 +131,6 @@ RUN set -eux; \
     \
     "/opt/ghc/$GHC/bin/ghc" --version
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
 
 CMD ["ghci"]