summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ci/templates/Docker.gitlab-ci.yml')
-rw-r--r--lib/gitlab/ci/templates/Docker.gitlab-ci.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
index 15cdbf63cb1..5160c05a251 100644
--- a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
@@ -10,7 +10,8 @@ docker-build-master:
- docker build --pull -t "$CI_REGISTRY_IMAGE" .
- docker push "$CI_REGISTRY_IMAGE"
only:
- - master
+ variables:
+ - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
docker-build:
# Official docker image.
@@ -24,4 +25,5 @@ docker-build:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
except:
- - master
+ variables:
+ - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME