From 5b5c3296999395acda2c7ba510690056679ccd70 Mon Sep 17 00:00:00 2001 From: Clemens Beck <cbeck@gitlab.com> Date: Wed, 26 Mar 2025 13:25:56 +0100 Subject: [PATCH] CI: Use gcr mirror in DinD --- .gitlab/ci/defaults.gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/defaults.gitlab-ci.yml b/.gitlab/ci/defaults.gitlab-ci.yml index 433187d..d1164c7 100644 --- a/.gitlab/ci/defaults.gitlab-ci.yml +++ b/.gitlab/ci/defaults.gitlab-ci.yml @@ -5,8 +5,9 @@ default: # `DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --push --platform linux/amd64,linux/arm64 -t <image tag> -f docker/builders/Dockerfile_base_image .` image: "${CI_REGISTRY_IMAGE}/base-image:latest" services: - - name: docker:20.10.23-dind - command: ["--experimental"] + - name: docker:28.0.2-dind + alias: docker + entrypoint: [ "sh", "-c", "dockerd-entrypoint.sh $DOCKER_OPTIONS" ] before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" - if [ -n "${USE_BUILDX}" ]; then @@ -17,3 +18,5 @@ variables: CANONICAL_PROJECT_PATH: "gitlab-org/gitlab-omnibus-builder" MIRROR_PROJECT_PATH: "cookbooks/gitlab-omnibus-builder" ARM64_RUNNER_TAG: 'arm64' + DOCKER_MIRROR: "https://mirror.gcr.io" + DOCKER_OPTIONS: "--registry-mirror ${DOCKER_MIRROR}" -- GitLab