summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-09-27 09:22:49 +0000
committerRémy Coutable <remy@rymai.me>2018-09-27 09:22:49 +0000
commit191f235bdcc0f180c1808c76d1e525b733db7102 (patch)
tree6e115f91de2aa0830c3036dc45e230987444e230
parentad597a6aa8d5b31a7cf43028e7d60d33ac5d0d8c (diff)
parenta104f3ecb28a2de5be426f64497b5cea7e95a2b3 (diff)
downloadgitlab-ce-191f235bdcc0f180c1808c76d1e525b733db7102.tar.gz
Merge branch 'patch-28' into 'master'
Update using_docker_build.md See merge request gitlab-org/gitlab-ce!21927
-rw-r--r--doc/ci/docker/using_docker_build.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index aa997d15b64..0b64c8caba7 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -314,8 +314,8 @@ build:
stage: build
script:
- docker pull $CONTAINER_IMAGE:latest || true
- - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_BUILD_REF --tag $CONTAINER_IMAGE:latest .
- - docker push $CONTAINER_IMAGE:$CI_BUILD_REF
+ - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .
+ - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
- docker push $CONTAINER_IMAGE:latest
```