Skip to content

Commit e7ef31e

Browse files
committed
Use more images from Quay
1 parent 5119352 commit e7ef31e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.devcontainer/GHC.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG HLS_VERSION
44
ARG STACK_VERSION
55

66
ARG HLS_GHC_VERSION=${HLS_VERSION:+$GHC_VERSION}
7-
ARG HLS_SFX=/${HLS_GHC_VERSION:-all}/hls:${HLS_VERSION:-none}
7+
ARG HLS_IMAGE_TAG=${HLS_VERSION:-none}-ghc${HLS_GHC_VERSION:-all}
88

99
ARG STACK_VERSION_OVERRIDE=${STACK_VERSION}
1010

@@ -21,9 +21,9 @@ RUN find /files -type d -exec chmod 755 {} \; \
2121
&& find /files -type f -exec chmod 644 {} \; \
2222
&& find /files/usr/local/bin -type f -exec chmod 755 {} \;
2323

24-
FROM glcr.b-data.ch/ghc/ghc-musl${HLS_SFX} as hls
24+
FROM quay.io/benz0li/hlssi:${HLS_IMAGE_TAG} AS hlssi
2525

26-
FROM glcr.b-data.ch/ndmitchell/hlsi:latest as hlsi
26+
FROM quay.io/benz0li/hlsi:latest AS hlsi
2727

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

@@ -89,7 +89,7 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
8989

9090
## Copy binaries as late as possible to avoid cache busting
9191
## Install HLS
92-
COPY --from=hls /usr/local /usr/local
92+
COPY --from=hlssi /usr/local /usr/local
9393
## Install HLint
9494
COPY --from=hlsi /usr/local /usr/local
9595
## Install ShellCheck

0 commit comments

Comments
 (0)