From 8a6c159aa164818829a3b2f21b229a3efcbfd06c Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Thu, 2 Dec 2021 18:28:28 +0100
Subject: [PATCH] Rebuild GHC version 9.0.1
- Update base image to alpine:3.15
---
9.0.1.Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/9.0.1.Dockerfile b/9.0.1.Dockerfile
index 4879fb7..9bc190f 100644
--- a/9.0.1.Dockerfile
+++ b/9.0.1.Dockerfile
@@ -26,7 +26,7 @@ RUN apk add --update --no-cache \
RUN cd /tmp \
&& curl -sSLO https://downloads.haskell.org/~ghc/$GHC_VERSION/ghc-$GHC_VERSION-src.tar.xz \
&& curl -sSLO https://downloads.haskell.org/~ghc/$GHC_VERSION/ghc-$GHC_VERSION-src.tar.xz.sig \
- && gpg --keyserver hkps://pgp.mit.edu:443 \
+ && gpg --keyserver hkps://keyserver.ubuntu.com:443 \
--receive-keys FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD \
&& gpg --verify ghc-$GHC_VERSION-src.tar.xz.sig ghc-$GHC_VERSION-src.tar.xz \
&& tar xf ghc-$GHC_VERSION-src.tar.xz \
@@ -56,7 +56,7 @@ RUN cd /tmp \
# See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
&& cabal install cabal-install-$CABAL_VERSION
-FROM alpine:3.13 as builder
+FROM alpine:3.15 as builder
LABEL org.label-schema.license="MIT" \
org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
@@ -64,6 +64,7 @@ LABEL org.label-schema.license="MIT" \
ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.0.1}
ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.4.0.0}
+ENV PATH=$PATH:/usr/lib/llvm10/bin
RUN apk add --update --no-cache \
bash \
--
GitLab