summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-01-18 04:25:18 +0000
committerEvan Read <eread@gitlab.com>2019-01-18 04:25:18 +0000
commitf22e4a368b0eca538b384a73597f2bd5578a82f2 (patch)
tree7199ed850a84c438ba4927a6e55df9ab031c2331
parentb9494bf302e6b13fed230bec598c427a32f05ff7 (diff)
parentacc2dd2366864723f41bcd087cff63023b4bf5d7 (diff)
downloadgitlab-ce-f22e4a368b0eca538b384a73597f2bd5578a82f2.tar.gz
Merge branch 'patch-29' into 'master'
Use CI variables in CI docker build examples See merge request gitlab-org/gitlab-ce!24130
-rw-r--r--doc/ci/docker/using_docker_build.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index fef367051bf..cd1a6695fbd 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -521,11 +521,11 @@ stages:
variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2
- CONTAINER_TEST_IMAGE: registry.example.com/my-group/my-project/my-image:$CI_COMMIT_REF_SLUG
- CONTAINER_RELEASE_IMAGE: registry.example.com/my-group/my-project/my-image:latest
+ CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+ CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
before_script:
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.example.com
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
build:
stage: build