Jobs should be better isolated to avoid interference with other `image` or `before_script` statements.
This commit is contained in:
parent
e556b421c5
commit
96200113f0
|
@ -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
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue