diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2019-02-14 12:26:26 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-02-14 03:51:21 +0100 |
| commit | 2346cef9fe83bca1e432ee78de94b956bc712a0b (patch) | |
| tree | 8a1d49987f380b1d96f212f5bc453e7a3875340f /.gitlab-ci.yml | |
| parent | 7c1ae35b7fb519107bdea0ae85a211325747af95 (diff) | |
| download | samba-2346cef9fe83bca1e432ee78de94b956bc712a0b.tar.gz | |
.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 <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Feb 14 03:51:21 CET 2019 on sn-devel-144
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b39f7864257..53b2acf121f 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 |