Skip to content

Commit fd67596

Browse files
committed
fix: fix docker build warnings in 9.12.1 images
- SecretsUsedInArgOrEnv: Some names in ARG trigger this warning, even if this doesn't apply to us -> renaming those variables fixes this warning - LegacyKeyValueFormat: using the new format for ENV fixes this warning
1 parent f4c06ca commit fd67596

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Diff for: 9.12/bookworm/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:bookworm
22

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

55
# common haskell + stack dependencies
66
RUN apt-get update && \
@@ -24,7 +24,7 @@ RUN apt-get update && \
2424
rm -rf /var/lib/apt/lists/*
2525

2626
ARG STACK=3.1.1
27-
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
27+
ARG STACK_RELEASE_GPG=C5705533DA4F78D8664B5DC0575159689BEFB442
2828

2929
RUN set -eux; \
3030
cd /tmp; \
@@ -45,7 +45,7 @@ RUN set -eux; \
4545
\
4646
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
4747
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
48-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
48+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_GPG"; \
4949
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
5050
gpgconf --kill all; \
5151
\
@@ -58,7 +58,7 @@ RUN set -eux; \
5858
stack --version;
5959

6060
ARG CABAL_INSTALL=3.14.1.0
61-
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
61+
ARG CABAL_INSTALL_RELEASE_GPG=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
6262

6363
RUN set -eux; \
6464
cd /tmp; \
@@ -82,7 +82,7 @@ RUN set -eux; \
8282
curl -sSLO "$CABAL_INSTALL_SHA256SUMS_URL"; \
8383
curl -sSLO "$CABAL_INSTALL_SHA256SUMS_URL.sig"; \
8484
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
85-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_KEY"; \
85+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_GPG"; \
8686
gpg --batch --verify SHA256SUMS.sig SHA256SUMS; \
8787
# confirm we are verifying SHA256SUMS that matches the release + sha256
8888
grep "$CABAL_INSTALL_SHA256 $CABAL_INSTALL_TAR" SHA256SUMS; \
@@ -95,7 +95,7 @@ RUN set -eux; \
9595
cabal --version
9696

9797
ARG GHC=9.12.1
98-
ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
98+
ARG GHC_RELEASE_GPG=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
9999

100100
RUN set -eux; \
101101
cd /tmp; \
@@ -116,7 +116,7 @@ RUN set -eux; \
116116
\
117117
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
118118
curl -sSL "$GHC_URL.sig" -o ghc.tar.xz.sig; \
119-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$GHC_RELEASE_KEY"; \
119+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$GHC_RELEASE_GPG"; \
120120
gpg --batch --verify ghc.tar.xz.sig ghc.tar.xz; \
121121
gpgconf --kill all; \
122122
\
@@ -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"]

Diff for: 9.12/slim-bookworm/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:bookworm-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 && \
@@ -24,7 +24,7 @@ RUN apt-get update && \
2424
rm -rf /var/lib/apt/lists/*
2525

2626
ARG STACK=3.1.1
27-
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
27+
ARG STACK_RELEASE_GPG=C5705533DA4F78D8664B5DC0575159689BEFB442
2828

2929
RUN set -eux; \
3030
cd /tmp; \
@@ -45,7 +45,7 @@ RUN set -eux; \
4545
\
4646
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
4747
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
48-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
48+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_GPG"; \
4949
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
5050
gpgconf --kill all; \
5151
\
@@ -58,7 +58,7 @@ RUN set -eux; \
5858
stack --version;
5959

6060
ARG CABAL_INSTALL=3.14.1.0
61-
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
61+
ARG CABAL_INSTALL_RELEASE_GPG=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
6262

6363
RUN set -eux; \
6464
cd /tmp; \
@@ -82,7 +82,7 @@ RUN set -eux; \
8282
curl -sSLO "$CABAL_INSTALL_SHA256SUMS_URL"; \
8383
curl -sSLO "$CABAL_INSTALL_SHA256SUMS_URL.sig"; \
8484
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
85-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_KEY"; \
85+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_GPG"; \
8686
gpg --batch --verify SHA256SUMS.sig SHA256SUMS; \
8787
# confirm we are verifying SHA256SUMS that matches the release + sha256
8888
grep "$CABAL_INSTALL_SHA256 $CABAL_INSTALL_TAR" SHA256SUMS; \
@@ -95,7 +95,7 @@ RUN set -eux; \
9595
cabal --version
9696

9797
ARG GHC=9.12.1
98-
ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
98+
ARG GHC_RELEASE_GPG=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
9999

100100
RUN set -eux; \
101101
cd /tmp; \
@@ -116,7 +116,7 @@ RUN set -eux; \
116116
\
117117
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
118118
curl -sSL "$GHC_URL.sig" -o ghc.tar.xz.sig; \
119-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$GHC_RELEASE_KEY"; \
119+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$GHC_RELEASE_GPG"; \
120120
gpg --batch --verify ghc.tar.xz.sig ghc.tar.xz; \
121121
gpgconf --kill all; \
122122
\
@@ -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"]

0 commit comments

Comments
 (0)