Commit e63b65cd authored by Kamil Trzciński's avatar Kamil Trzciński

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
parents e556b421 96200113
---
title: Better isolated `Docker.gitlab-ci.yml` to avoid interference with other job configurations.
merge_request: 28213
author: lrkwz
type: changed
# 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: build-master:
# Official docker image.
image: docker:latest
stage: build stage: build
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE" . - docker build --pull -t "$CI_REGISTRY_IMAGE" .
- docker push "$CI_REGISTRY_IMAGE" - docker push "$CI_REGISTRY_IMAGE"
...@@ -16,7 +13,13 @@ build-master: ...@@ -16,7 +13,13 @@ build-master:
- master - master
build: build:
# Official docker image.
image: docker:latest
stage: build stage: build
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment