From fdabfb75fad2a546ec1e87a57f38a621970c0d6c Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Wed, 13 Sep 2023 06:27:24 +0200
Subject: [PATCH] Update GHC.Dockerfile

- Install package yamllint
- Also install HLint
  - w/o installing haskell-linter extension
---
 .devcontainer/GHC.Dockerfile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/GHC.Dockerfile b/.devcontainer/GHC.Dockerfile
index 0da808d3342f7..679cf328e1d25 100644
--- a/.devcontainer/GHC.Dockerfile
+++ b/.devcontainer/GHC.Dockerfile
@@ -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}
@@ -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" ;; \
@@ -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