diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9246ce008c08ec131262bbf385c54000ef77a88..524630fb2ad5ec9dfaa26649de1047684ca01417 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,13 +160,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 12d5b59c1991bbbfba8575aaad6dc1904e813ff3..839ad2186a09e766b9f735add27fdfcc40964a9d 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.0.1 as bootstrap +FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap COPY patches/* /tmp/