From 48949528c23e5571bc39850183d16b948829144e Mon Sep 17 00:00:00 2001
From: Patrick Jentsch
Date: Tue, 4 Jun 2019 11:40:39 +0200
Subject: [PATCH] Add docker tag
---
.gitlab-ci.yml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb40b6e..0dd339f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,31 +6,35 @@ before_script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
Build:
- stage: build
image: docker:latest
script:
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - docker build --pull -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA .
- - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+ - docker build --pull -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA .
+ - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
services:
- - docker:dind
+ - docker:dind
+ stage: build
tags:
- docker
Push master:
- stage: push
only:
- master
script:
- docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
- docker push $CI_REGISTRY_IMAGE:latest
+ stage: push
+ tags:
+ - docker
Push others:
- stage: push
except:
- master
script:
- docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+ stage: push
+ tags:
+ - docker