diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20501b8a6af79e2d744ea0affb3d600b3209badc..0824ac5ae919ade6c63f888d4d28c77e929f70bc 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 41f1420d81d382b19a02a1b4f927e0fa3961f5fe..e246837cb6a323a13e570f17b09560e97065a16d 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