Rebuild GHC version 8.8.4

.gitlab-ci.yml

@@ -9,7 +9,7 @@
     if [[ $CI_COMMIT_BRANCH == "master" ]]; then
       export CI_APP_TAG=${CI_APP_TAG:-latest}
     elif [[ $CI_COMMIT_BRANCH == "freeze-version" ]]; then
-      export CI_APP_TAG=${CI_APP_TAG:-8.10.4}
+      export CI_APP_TAG=${CI_APP_TAG:-8.8.4}
     else
       export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA}
     fi
@@ -79,11 +79,11 @@ build:version-linux-amd64:
     - >
       docker build -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
       -f $CI_APP_TAG.Dockerfile .
-    - docker push -a $CI_APP_REPO
+    - docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64
   rules:
     - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
       changes:
-        - 8.10.4.Dockerfile
+        - 8.8.4.Dockerfile
 
 build:version-linux-arm64v8:
   extends: .build
@@ -94,11 +94,11 @@ build:version-linux-arm64v8:
     - >
       docker build -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
       -f $CI_APP_TAG.Dockerfile .
-    - docker push -a $CI_APP_REPO
+    - docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
   rules:
     - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
       changes:
-        - 8.10.4.Dockerfile
+        - 8.8.4.Dockerfile
 
 build-manifest:latest-linux-multiarch:
   extends: .build
@@ -139,10 +139,7 @@ build-manifest:version-linux-multiarch:
 
       docker manifest create $CI_APP_REPO:$VERSION_MAJ_MIN $CI_MANIFEST_LIST
       && docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
-
-      docker manifest create $CI_APP_REPO:$VERSION_MAJ $CI_MANIFEST_LIST
-      && docker manifest push $CI_APP_REPO:$VERSION_MAJ
   rules:
     - if: $CI_COMMIT_BRANCH == "freeze-version"
       changes:
-        - 8.10.4.Dockerfile
+        - 8.8.4.Dockerfile

8.8.4.Dockerfile

@@ -119,7 +119,7 @@ RUN ghc -static -optl-pthread -optl-static Main.hs \
   && mkdir cabal-test \
   && cd cabal-test \
   && cabal update \
-  && cabal init -n --is-executable -p tester -l BSD3 \
+  && cabal init -n --is-executable -p tester -l MIT \
   && cabal run
 
 FROM builder as final

latest.Dockerfile

 ARG GHC_VERSION_BUILD
 ARG CABAL_VERSION_BUILD
 
-FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.4 as bootstrap
+FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:bootstrap as bootstrap
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.0.1}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.4.0.0}
+ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.8.4}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
 
 RUN apk add --update --no-cache \
     autoconf \
@@ -32,7 +32,7 @@ RUN cd /tmp \
   && tar xf ghc-$GHC_VERSION-src.tar.xz \
   && cd ghc-$GHC_VERSION \
   # Set llvm version to 10
-  && sed -i -e 's/LlvmVersion=9/LlvmVersion=10/g' configure.ac \
+  && sed -i -e 's/LlvmVersion=7/LlvmVersion=10/g' configure.ac \
   && cp mk/build.mk.sample mk/build.mk \
   && echo 'BuildFlavour=perf-llvm' >> mk/build.mk \
   && echo 'BeConservative=YES' >> mk/build.mk \
@@ -56,14 +56,14 @@ 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.12 as builder
 
 LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
       maintainer="Olivier Benz <olivier.benz@b-data.ch>"
 
-ENV GHC_VERSION=${GHC_VERSION_BUILD:-9.0.1}
-ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.4.0.0}
+ENV GHC_VERSION=${GHC_VERSION_BUILD:-8.8.4}
+ENV CABAL_VERSION=${CABAL_VERSION_BUILD:-3.2.0.0}
 
 RUN apk add --update --no-cache \
     bash \