From a6d25617c1b02fdcbd544ab15e863a19aa037b17 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 22 Jan 2021 11:33:01 +0100
Subject: [PATCH] CI: use branch name instead of commit to tag images,
 deactivate kaniko cache

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d892544..e8ae18b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
   GIT_SUBMODULE_STRATEGY: normal
-  DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
+  DOCKER_TAG: ${CI_COMMIT_BRANCH}
   DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}
 
 cache:
@@ -42,8 +42,5 @@ deploy:
       --dockerfile ${CI_PROJECT_DIR}/Dockerfile
       --destination ${DOCKER_IMAGE}:${DOCKER_TAG}
       --snapshotMode=redo
-      --cache=true
-      --cache-ttl=12h
-  only:
-   refs:
-     - master
+  dependencies:
+    - build