From b5f2f4ff0e056167c2ec027ec627604e2c8b6cce Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Wed, 4 Sep 2024 04:59:15 +0200
Subject: [PATCH] ci(gitlab-ci): use CI_JOB_MANUAL for container setup

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c5dba23b..e2b482052 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,10 +88,10 @@ setup:containers:frontend:
     - REGISTRY_DESTINATION=${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
     - IMAGE_EXISTS=`curl "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/registry/repositories?tags=true" | grep \""${REGISTRY_DESTINATION}"\"`
     - echo ${IMAGE_EXISTS}
-    - echo ${FORCE_REBUILD_IMAGE}
-    - test ${FORCE_REBUILD_IMAGE} == true && echo "Force rebuilding container."
+    - echo ${CI_JOB_MANUAL}
+    - test ${CI_JOB_MANUAL} == true && echo "Force rebuilding container."
     - >
-      if [ -z ${IMAGE_EXISTS} -o ${FORCE_REBUILD_IMAGE} == true ] ; then
+      if [ -z ${IMAGE_EXISTS} -o ${CI_JOB_MANUAL} == true ] ; then
         echo "Building image..."
         buildah bud -t ${IMAGE_TAG} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --volume ${CI_PROJECT_DIR}:/tmp/${CI_PROJECT_DIR} --file docker/frontend/Dockerfile
         buildah push --creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" ${IMAGE_TAG} ${REGISTRY_DESTINATION}
@@ -100,11 +100,6 @@ setup:containers:frontend:
       fi
   rules:
     - when: always
-      variables:
-        FORCE_REBUILD_IMAGE: false
-    - when: manual
-      variables:
-        FORCE_REBUILD_IMAGE: true
 
 setup:containers:backend: &containers-backend
   stage: setup