diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-21 14:09:49 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-21 14:09:49 +0000 |
| commit | e63b65cd4f5d8298cb0441a5e0e5a0321f739367 (patch) | |
| tree | 662e7a5d8ca7b538e324c1edfeeb301abd28f9ff | |
| parent | e556b421c503a067908d6937a2deb74310037a29 (diff) | |
| parent | 96200113f0fad8e003c958000f34bc4b808dc556 (diff) | |
| download | gitlab-ce-e63b65cd4f5d8298cb0441a5e0e5a0321f739367.tar.gz | |
Merge branch 'patch-55' into 'master'
Jobs should be better isolated to avoid interference with other `image` or...
See merge request gitlab-org/gitlab-ce!28213
| -rw-r--r-- | changelogs/unreleased/patch-55.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Docker.gitlab-ci.yml | 21 |
2 files changed, 17 insertions, 9 deletions
diff --git a/changelogs/unreleased/patch-55.yml b/changelogs/unreleased/patch-55.yml new file mode 100644 index 00000000000..7a6d6bfed2f --- /dev/null +++ b/changelogs/unreleased/patch-55.yml @@ -0,0 +1,5 @@ +--- +title: Better isolated `Docker.gitlab-ci.yml` to avoid interference with other job configurations. +merge_request: 28213 +author: lrkwz +type: changed diff --git a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml index eeefadaa019..f6d240b7b6d 100644 --- a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml @@ -1,14 +1,11 @@ -# Official docker image. -image: docker:latest - -services: - - docker:dind - -before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - build-master: + # Official docker image. + image: docker:latest stage: build + services: + - docker:dind + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - docker build --pull -t "$CI_REGISTRY_IMAGE" . - docker push "$CI_REGISTRY_IMAGE" @@ -16,7 +13,13 @@ build-master: - master build: + # Official docker image. + image: docker:latest stage: build + services: + - docker:dind + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" |