NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hardcode-registry' into 'master'

Browse source 
Hardcode registry for default build image in ci

Closes #111

See merge request gitlab-org/gitlab-build-images!556
This commit is contained in:
Balasankar 'Balu' C 2022-07-01 17:25:14 +00:00
commit 703c30315e
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -4,7 +4,7 @@ include:
- local: '.gitlab/ci/*.yml'
default:
image: ${CI_REGISTRY_IMAGE}/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:

11
.gitlab/ci/definitions.yml
View file

@ -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