From 547139514d76e7c2056414b7720d9480a7150483 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 31 Aug 2021 15:47:49 +0200
Subject: [PATCH] ci: fix docker builds

---
 .gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d4fac1..bce3a44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build:docker:
   stage: build
   image: docker
   script:
-    - docker build --tag ${CI_REGISTRY_IMAGE} .
+    - docker build --tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_BRANCH} .
   tags:
     - docker
 
@@ -59,9 +59,6 @@ deploy:docker:
   before_script:
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
-    - docker push ${CI_REGISTRY_IMAGE}
+    - docker push ${CI_REGISTRY_IMAGE}:${CI_COMMIT_BRANCH}
   tags:
-    - shell
-    - linux
-  only:
-    - ci-docker
+    - docker