templates/base.yml

@@ -13,9 +13,6 @@
 # * PHPUNIT_ENABLED: 1
 # * PHPCS_ENABLED: 1
 # * SENTRY_ENABLED: 1
-#
-# Please specify the DOCKER_REGISTRY_PASSWORD environment
-# variable in your project.
 
 variables:
     GIT_SUBMODULE_STRATEGY: recursive
@@ -57,9 +54,6 @@ variables:
 
     configure_environment ()
     {
-        # Check required variables
-        is_var_set DOCKER_REGISTRY_PASSWORD
-
         # Set addtional environment variables
         export DOCKER_IMAGE_REPOSITORY=$DOCKER_REGISTRY/$CI_PROJECT_PATH
         export DOCKER_IMAGE_CI_TAG=$CI_COMMIT_REF_SLUG-$CI_PIPELINE_IID
@@ -67,7 +61,7 @@ variables:
 
         # Login in docker registry
         docker version
-        docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY
+        docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $DOCKER_REGISTRY
     }
 
     build_docker_image ()
@@ -134,7 +128,7 @@ variables:
 
     cleanup_docker_repository ()
     {
-        docker run anoxis/registry-cli -r https://$DOCKER_REGISTRY -l $DOCKER_REGISTRY_USERNAME:$DOCKER_REGISTRY_PASSWORD --delete-all -i $CI_PROJECT_PATH --keep-tags-like "$KEEP_DOCKER_IMAGES" --keep-by-hours 720
+        docker run anoxis/registry-cli -r https://$DOCKER_REGISTRY -l gitlab-ci-token:$CI_BUILD_TOKEN --delete-all -i $CI_PROJECT_PATH --keep-tags-like "$KEEP_DOCKER_IMAGES" --keep-by-hours 720
     }
 
 .base_job: