From 46a5de41bd902d6a049037bac1e9cf6b4a775bc9 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Sun, 1 Jan 2023 14:56:37 +0100
Subject: [PATCH] Update GHC to v9.4.4
- Update base image to alpine:3.17; Use LLVM v14
---
.gitlab-ci.yml | 2 +-
latest.Dockerfile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8986471..f46d256 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
- GHC_VERSION_BUILD: "9.4.3"
+ GHC_VERSION_BUILD: "9.4.4"
CABAL_VERSION_BUILD: "3.8.1.0"
before_script:
- *before-script-build
diff --git a/latest.Dockerfile b/latest.Dockerfile
index f0d0531..15b33bc 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -52,7 +52,7 @@ RUN cd /tmp \
# See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
&& cabal install --allow-newer cabal-install-$CABAL_VERSION
-FROM alpine:3.16 as builder
+FROM alpine:3.17 as builder
LABEL org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.source="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
@@ -81,7 +81,7 @@ RUN apk upgrade --no-cache \
libcurl \
libffi \
libffi-dev \
- llvm12 \
+ llvm14 \
ncurses-dev \
ncurses-static \
openssl-dev \
--
GitLab