Skip to content

Commit 018abed

Browse files
Totto16Totto16
authored
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
1 parent fb09947 commit 018abed

File tree

20 files changed

+44
-42
lines changed

20 files changed

+44
-42
lines changed

‎.github/workflows/debian.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919
jobs:
2020
build-smoke-test:
2121
timeout-minutes: 30
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
2323
name: ${{ matrix.ghc }}-${{ matrix.deb }}
2424
strategy:
2525
fail-fast: false
@@ -68,7 +68,8 @@ jobs:
6868
command: |
6969
docker build --pull \
7070
-t haskell:${{ matrix.ghc }}-${{ matrix.deb }} \
71-
${{ matrix.ghc_minor }}/${{ matrix.deb }}
71+
${{ matrix.ghc_minor }}/${{ matrix.deb }} \
72+
--build-arg "BUILDKIT_DOCKERFILE_CHECK=skip=SecretsUsedInArgOrEnv;error=true"
7273
- uses: actions/checkout@v4
7374
with:
7475
repository: docker-library/official-images
@@ -78,7 +79,7 @@ jobs:
7879

7980
emulated-architecture-tests:
8081
timeout-minutes: 60
81-
runs-on: ubuntu-latest
82+
runs-on: ubuntu-24.04
8283
name: ${{ matrix.arch }}-${{ matrix.ghc }}-${{ matrix.deb }}
8384
strategy:
8485
fail-fast: false
@@ -135,7 +136,8 @@ jobs:
135136
docker build --pull --progress=plain \
136137
--platform "linux/${{ matrix.docker_platform }}" \
137138
-t haskell:${{ matrix.ghc }}-${{ matrix.deb }} \
138-
${{ matrix.ghc_minor }}/${{ matrix.deb }}
139+
${{ matrix.ghc_minor }}/${{ matrix.deb }} \
140+
--build-arg "BUILDKIT_DOCKERFILE_CHECK=skip=SecretsUsedInArgOrEnv;error=true"
139141
echo 'testing..'
140142
docker run \
141143
--platform "linux/${{ matrix.docker_platform }}" \

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ on:
1010

1111
jobs:
1212
hadolint:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- uses: actions/checkout@v4
16-
- uses: hadolint/hadolint-action@v1.6.0
16+
- uses: hadolint/hadolint-action@v3.1.0
1717
with:
1818
recursive: true

‎9.0/buster/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM buildpack-deps:buster
22

3-
ENV LANG C.UTF-8
3+
ENV LANG=C.UTF-8
44

55
# additional haskell specific deps
66
RUN apt-get update && \
@@ -132,6 +132,6 @@ RUN set -eux; \
132132
\
133133
"/opt/ghc/$GHC/bin/ghc" --version
134134

135-
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
135+
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
136136

137137
CMD ["ghci"]

‎9.0/slim-buster/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:buster-slim
22

3-
ENV LANG C.UTF-8
3+
ENV LANG=C.UTF-8
44

55
# common haskell + stack dependencies
66
RUN apt-get update && \
@@ -148,6 +148,6 @@ RUN set -eux; \
148148
\
149149
"/opt/ghc/$GHC/bin/ghc" --version
150150

151-
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
151+
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
152152

153153
CMD ["ghci"]

‎9.10/bullseye/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:bullseye
22

3-
ENV LANG C.UTF-8
3+
ENV LANG=C.UTF-8
44

55
# common haskell + stack dependencies
66
RUN apt-get update && \
@@ -129,6 +129,6 @@ RUN set -eux; \
129129
\
130130
"/opt/ghc/$GHC/bin/ghc" --version
131131

132-
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
132+
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
133133

134134
CMD ["ghci"]

‎9.10/buster/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:buster
22

3-
ENV LANG C.UTF-8
3+
ENV LANG=C.UTF-8
44

55
# common haskell + stack dependencies
66
RUN apt-get update && \
@@ -129,6 +129,6 @@ RUN set -eux; \
129129
\
130130
"/opt/ghc/$GHC/bin/ghc" --version
131131

132-
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
132+
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
133133

134134
CMD ["ghci"]

‎9.10/slim-bullseye/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:bullseye-slim
22

3-
ENV LANG C.UTF-8
3+
ENV LANG=C.UTF-8
44

55
# common haskell + stack dependencies
66
RUN apt-get update && \
@@ -129,6 +129,6 @@ RUN set -eux; \
129129
\
130130
"/opt/ghc/$GHC/bin/ghc" --version
131131

132-
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
132+
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
133133

134134
CMD ["ghci"]

‎9.10/slim-buster/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:buster-slim
22

3-
ENV LANG C.UTF-8
3+
ENV LANG=C.UTF-8
44

55
# common haskell + stack dependencies
66
RUN apt-get update && \
@@ -131,6 +131,6 @@ RUN set -eux; \
131131
\
132132
"/opt/ghc/$GHC/bin/ghc" --version
133133

134-
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
134+
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
135135

136136
CMD ["ghci"]

‎9.2/buster/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM buildpack-deps:buster
22

3-
ENV LANG C.UTF-8
3+
ENV LANG=C.UTF-8
44

55
# additional haskell specific deps
66
RUN apt-get update && \
@@ -115,6 +115,6 @@ RUN set -eux; \
115115
\
116116
"/opt/ghc/$GHC/bin/ghc" --version
117117

118-
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
118+
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
119119

120120
CMD ["ghci"]

‎9.2/slim-buster/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:buster-slim
22

3-
ENV LANG C.UTF-8
3+
ENV LANG=C.UTF-8
44

55
# common haskell + stack dependencies
66
RUN apt-get update && \
@@ -131,6 +131,6 @@ RUN set -eux; \
131131
\
132132
"/opt/ghc/$GHC/bin/ghc" --version
133133

134-
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
134+
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
135135

136136
CMD ["ghci"]

0 commit comments

Comments
 (0)