diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-06-26 15:36:29 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2017-06-26 15:47:15 +0000 |
| commit | 5461623dca6cfbae5794052772f58bd657d21ea4 (patch) | |
| tree | aa6ce4f04884df0ebdb8cb6520e562eb5f0daf0e /vendor/gitlab-ci-yml/Docker.gitlab-ci.yml | |
| parent | 831054a79d20e7af01106d9b1ac5a18965a51dc8 (diff) | |
| download | gitlab-ce-5461623dca6cfbae5794052772f58bd657d21ea4.tar.gz | |
Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82
Update templates for 9.3
See merge request !12041
Diffstat (limited to 'vendor/gitlab-ci-yml/Docker.gitlab-ci.yml')
| -rw-r--r-- | vendor/gitlab-ci-yml/Docker.gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml b/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml index 40648bcd3de..5b6af7be8c4 100644 --- a/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml @@ -6,8 +6,8 @@ services: build: stage: build + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | tr -c '[:alnum:]_.-' '-') - - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY - - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . - - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" + - docker build --pull -t "$CI_REGISTRY_IMAGE:CI_COMMIT_REF_SLUG" . + - docker push "$CI_REGISTRY_IMAGE:CI_COMMIT_REF_SLUG" |