From 10dc2cb36af4d1c954b46040a963687e8d1ba654 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Fri, 4 Nov 2022 11:57:26 +0100
Subject: [PATCH] Update GHC to v9.4.3
---
.gitlab-ci.yml | 2 +-
latest.Dockerfile | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20501b8..0824ac5 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.2"
+ GHC_VERSION_BUILD: "9.4.3"
CABAL_VERSION_BUILD: "3.8.1.0"
before_script:
- *before-script-build
diff --git a/latest.Dockerfile b/latest.Dockerfile
index 41f1420..e246837 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -107,10 +107,7 @@ RUN cd /tmp \
&& ./configure --disable-ld-override \
&& make install \
&& cd / \
- && rm -rf /tmp/* \
- ## Somehow /tmp/ghc-$GHC_VERSION-*-alpine-linux
- ## ends up at /usr/local/share/doc/ghc-$GHC_VERSION
- && rm -rf /usr/local/share/doc/ghc-$GHC_VERSION/*
+ && rm -rf /tmp/*
FROM builder as tester
--
GitLab