diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-02 16:58:28 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-02 16:58:28 -0700 |
| commit | 408df2edcbd5f3f93ef5541bac9de2b71ba4f0ea (patch) | |
| tree | 708ae61f9683b48f436f7577d1fad98f30e100fc /vendor/gitlab-ci-yml/Docker.gitlab-ci.yml | |
| parent | 3f81586ef0ab20533b8da1213bd9f60e1786dbaa (diff) | |
| parent | faa2a123911eaf84bb57163ea7af759d4632601b (diff) | |
| download | gitlab-ce-408df2edcbd5f3f93ef5541bac9de2b71ba4f0ea.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'vendor/gitlab-ci-yml/Docker.gitlab-ci.yml')
| -rw-r--r-- | vendor/gitlab-ci-yml/Docker.gitlab-ci.yml | 19 |
1 files changed, 15 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..eeefadaa019 100644 --- a/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml @@ -4,10 +4,21 @@ image: docker:latest services: - docker:dind +before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + +build-master: + stage: build + script: + - docker build --pull -t "$CI_REGISTRY_IMAGE" . + - docker push "$CI_REGISTRY_IMAGE" + only: + - master + build: stage: build 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" + except: + - master |