gitlab-ci: Rename DOCKER to CONTAINER
authorAndreas Schneider <asn@samba.org>
Thu, 14 Feb 2019 07:19:46 +0000 (08:19 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Thu, 14 Feb 2019 16:32:38 +0000 (17:32 +0100)
This is just a runc container, not tied to docker. See podman.io

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Björn Jacke <bj@sernet.de>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Feb 14 17:32:38 CET 2019 on sn-devel-144

.gitlab-ci.yml

index 53b2acf121fee8c5ddc48118964c0b0bb57c97f1..8dce4af6e0b41bb14edd56021776aa972829c933 100644 (file)
@@ -3,15 +3,15 @@
 
 variables:
   # 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
+  SAMBA_CI_CONTAINER_REGISTRY: registry.gitlab.com
+  SAMBA_CI_CONTAINER_NAME: samba-team/samba
+  SAMBA_CI_CONTAINER_TAG: latest
+  SAMBA_CI_CONTAINER_IMAGE: $SAMBA_CI_CONTAINER_REGISTRY/$SAMBA_CI_CONTAINER_NAME:$SAMBA_CI_CONTAINER_TAG
   GIT_STRATEGY: fetch
   GIT_DEPTH: "3"
 
 .shared_template:
-  image: $SAMBA_CI_DOCKER_IMAGE
+  image: $SAMBA_CI_CONTAINER_IMAGE
   stage: build
   tags:
     - docker