Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-25 18:06:16 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-25 18:06:16 +0300
commitb1d7b01241da7f7f5d42c5ef46c7788fac0ab6d3 (patch)
treeb53def1340801c2b7706e9f68f6b17a36efad4dd /lib
parentaabf412bc1f30cb12d97a077458d002c57cad8e9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/templates/Docker.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
index f6d240b7b6d..15cdbf63cb1 100644
--- a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
@@ -1,4 +1,4 @@
-build-master:
+docker-build-master:
# Official docker image.
image: docker:latest
stage: build
@@ -12,7 +12,7 @@ build-master:
only:
- master
-build:
+docker-build:
# Official docker image.
image: docker:latest
stage: build