Skip to content

Commit

Permalink
Update GHC.Dockerfile
Browse files Browse the repository at this point in the history
- Install package yamllint
- Also install HLint
  - w/o installing haskell-linter extension
  • Loading branch information
benz0li committed Sep 13, 2023
1 parent 2536e3b commit fdabfb7
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions .devcontainer/GHC.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ FROM glcr.b-data.ch/commercialhaskell/ssi:${STACK_VERSION_OVERRIDE} as ssi

FROM ${BUILD_ON_IMAGE}${HLS_SFX} as hls

FROM glcr.b-data.ch/ndmitchell/hlsi as hlsi

FROM docker.io/koalaman/shellcheck:stable as sci

FROM ${BUILD_ON_IMAGE}:${GHC_VERSION}
Expand All @@ -33,9 +35,9 @@ COPY --from=files /files /
RUN sysArch="$(uname -m)" \
## Ensure that common CA certificates
## and OpenSSL libraries are up to date
&& apk upgrade --no-cache \
ca-certificates \
openssl-dev \
&& apk upgrade --no-cache ca-certificates openssl-dev \
## Install yamllint
&& apk add --no-cache yamllint \
## Install hadolint
&& case "$sysArch" in \
x86_64) tarArch="x86_64" ;; \
Expand Down Expand Up @@ -86,8 +88,13 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
fi

## Copy binaries as late as possible to avoid cache busting
## Install Stack
COPY --from=ssi /usr/local /usr/local
## Install HLS
COPY --from=hls /usr/local /usr/local
## Install HLint
COPY --from=hlsi /usr/local /usr/local
## Install ShellCheck
COPY --from=sci --chown=root:root /bin/shellcheck /usr/local/bin

ARG HLS_VERSION
Expand Down

0 comments on commit fdabfb7

Please sign in to comment.