@@ -27,6 +27,8 @@ FROM quay.io/benz0li/hlssi:${HLS_IMAGE_TAG} AS hlssi
27
27
28
28
FROM quay.io/benz0li/hlsi:latest AS hlsi
29
29
30
+ FROM ghcr.io/hadolint/hadolint:latest as hsi
31
+
30
32
FROM docker.io/koalaman/shellcheck:stable AS sci
31
33
32
34
FROM ${BUILD_ON_IMAGE}:${GHC_VERSION}${SUBTAG:+-}${SUBTAG}
@@ -42,19 +44,7 @@ RUN sysArch="$(uname -m)" \
42
44
# # Install terminal multiplexers
43
45
&& apk add --no-cache screen tmux \
44
46
# # Install yamllint
45
- && apk add --no-cache yamllint \
46
- # # Install hadolint
47
- && case "$sysArch" in \
48
- x86_64) tarArch="x86_64" ;; \
49
- aarch64) tarArch="arm64" ;; \
50
- *) echo "error: Architecture $sysArch unsupported" ; exit 1 ;; \
51
- esac \
52
- && apiResponse="$(curl -sSL \
53
- https://api.github.com/repos/hadolint/hadolint/releases/latest)" \
54
- && downloadUrl="$(echo " $apiResponse" | grep -e \
55
- " browser_download_url.*Linux-$tarArch\" " | cut -d : -f 2,3 | tr -d \" )" \
56
- && echo "$downloadUrl" | xargs curl -sSLo /usr/local/bin/hadolint \
57
- && chmod 755 /usr/local/bin/hadolint
47
+ && apk add --no-cache yamllint
58
48
59
49
# # Update environment
60
50
ARG USE_ZSH_FOR_ROOT
@@ -97,6 +87,8 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
97
87
COPY --from=hlssi /usr/local /usr/local
98
88
# # Install HLint
99
89
COPY --from=hlsi /usr/local /usr/local
90
+ # # Install Haskell Dockerfile Linter
91
+ COPY --from=hsi /bin/hadolint /usr/local/bin
100
92
# # Install ShellCheck
101
93
COPY --from=sci --chown=root:root /bin/shellcheck /usr/local/bin
102
94
0 commit comments