diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a42611b4d2e34a3520d516a2552284c19fafdac..e0ed22ac0917597f2bf2e693297660afa180d6b9 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.6" - CABAL_VERSION_BUILD: "3.8.1.0" + GHC_VERSION_BUILD: "9.6.2" + CABAL_VERSION_BUILD: "3.10.1.0" STACK_VERSION: "2.11.1" before_script: - *before-script-build @@ -201,13 +201,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 8f916b796706f79d47b5e8b1d4cbbc5e8a8e6efe..a0c5fa8201cbc020947a3106f2faee2cf43f15a6 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -90,6 +90,7 @@ RUN apk add --no-cache \ pcre-dev \ pcre2 \ pcre2-dev \ + shadow \ perl \ wget \ xz \