From 2346cef9fe83bca1e432ee78de94b956bc712a0b Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Thu, 14 Feb 2019 12:26:26 +1300 Subject: [PATCH] .gitlab-ci.yml: Make docker image name more explicit The 'image' YAML tag implies a docker image, but for people who find gitlab mysterious, let's make it blatantly obvious what we're doing here. + added a comment + added 'DOCKER' to the variable names + removed 'BUILD', as we've now dropped this from all the job-names + tried to make the variable names consistent, both within the file and WRT docker terminology Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Feb 14 03:51:21 CET 2019 on sn-devel-144 --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b39f7864257e..53b2acf121fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,14 +2,16 @@ variables: - SAMBA_BUILD_GITLAB_CI_REGISTRY: registry.gitlab.com - SAMBA_BUILD_IMAGES_PROJECT: samba-team/samba - SAMBA_BUILD: latest + # we run autobuild.py inside a samba CI docker image located on gitlab's registry + SAMBA_CI_DOCKER_REGISTRY: registry.gitlab.com + SAMBA_CI_DOCKER_NAME: samba-team/samba + SAMBA_CI_DOCKER_TAG: latest + SAMBA_CI_DOCKER_IMAGE: $SAMBA_CI_DOCKER_REGISTRY/$SAMBA_CI_DOCKER_NAME:$SAMBA_CI_DOCKER_TAG GIT_STRATEGY: fetch GIT_DEPTH: "3" .shared_template: - image: $SAMBA_BUILD_GITLAB_CI_REGISTRY/$SAMBA_BUILD_IMAGES_PROJECT:$SAMBA_BUILD + image: $SAMBA_CI_DOCKER_IMAGE stage: build tags: - docker -- 2.34.1