diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c0c990ac870d23560963cd62f146d8987f8f385..61f4721e23da6e467915e429d5eedfb374010650 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,8 +35,8 @@ DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "/certs" BUILDX_NO_DEFAULT_ATTESTATIONS: "true" - GHC_VERSION_BUILD: "9.4.5" - CABAL_VERSION_BUILD: "3.8.1.0" + GHC_VERSION_BUILD: "9.6.1" + CABAL_VERSION_BUILD: "3.10.1.0" before_script: - *before-script-build @@ -196,13 +196,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 e3ee50ff62d35c6969e88e684108c81420c8837f..23baee674418382b5d402de0912128ef3e8307b6 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -1,7 +1,7 @@ ARG GHC_VERSION_BUILD ARG CABAL_VERSION_BUILD -FROM glcr.b-data.ch/ghc/ghc-musl:9.4.4 as bootstrap +FROM glcr.b-data.ch/ghc/ghc-musl:9.4.5 as bootstrap ARG GHC_VERSION_BUILD ARG CABAL_VERSION_BUILD