diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee29db2..ce83d9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ include: - local: '.gitlab/ci/*.yml' default: - image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-slim:docker-20.10.14-buildx-0.8 + image: ${BASE_BUILD_REGISTRY_IMAGE}/debian-bullseye-slim:docker-20.10.14-buildx-0.8 services: - docker:20.10.14-dind before_script: diff --git a/.gitlab/ci/definitions.yml b/.gitlab/ci/definitions.yml index 9b34ece..470cb2f 100644 --- a/.gitlab/ci/definitions.yml +++ b/.gitlab/ci/definitions.yml @@ -4,7 +4,14 @@ script: - ./scripts/lib/custom-docker-build rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_SERVER_HOST == "gitlab.com"' + variables: + BASE_BUILD_REGISTRY_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_SERVER_HOST == "gitlab.com"' variables: PUSH_CUSTOM_IMAGE: "true" + BASE_BUILD_REGISTRY_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && ($CI_SERVER_HOST == "ops.gitlab.net" || $CI_SERVER_HOST == "dev.gitlab.org")' + variables: + PUSH_CUSTOM_IMAGE: "true" + BASE_BUILD_REGISTRY_IMAGE: $CI_REGISTRY_IMAGE