diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c422d9a42e16e32181da23d291a4004832588a4..f46d25689323c2be13c5aa86cabc2f86e5d3a0a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,8 +33,8 @@ variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "/certs" - GHC_VERSION_BUILD: "9.2.6" - CABAL_VERSION_BUILD: "3.6.2.0" + GHC_VERSION_BUILD: "9.4.4" + CABAL_VERSION_BUILD: "3.8.1.0" before_script: - *before-script-build @@ -168,13 +168,6 @@ build-manifest:version-linux-multiarch: $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 fi docker manifest push $CI_APP_REPO:$CI_APP_TAG - - | - docker manifest create $CI_APP_REPO:$VERSION_MAJ_MIN $CI_MANIFEST_LIST - if echo $OS_ARCH | grep "linux-arm64v8" >/dev/null ; then - docker manifest annotate --variant v8 $CI_APP_REPO:$VERSION_MAJ_MIN \ - $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 - fi - docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN rules: - if: $CI_COMMIT_BRANCH == "freeze-version" changes: diff --git a/latest.Dockerfile b/latest.Dockerfile index 15b33bc184520ca56a4d12921a131cb517a0765b..e22cb46ccffe2282e2d1fc3cb9a564762b5cbf52 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -1,7 +1,7 @@ ARG GHC_VERSION_BUILD ARG CABAL_VERSION_BUILD -FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.5 as bootstrap +FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.6 as bootstrap ARG GHC_VERSION_BUILD ARG CABAL_VERSION_BUILD