From 2f8e6bc30b6a4932b8c41bce28469d57a49e0326 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Wed, 4 Sep 2024 04:41:01 +0200
Subject: [PATCH] ci(gitlab-ci): fix syntax even more

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f43d5ff32..934c27ba2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,23 +86,23 @@ setup:containers:frontend:
     - FRONTEND_IMAGE_VERSION=`cat frontend-image-version`
     - IMAGE_TAG=frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
     - REGISTRY_DESTINATION=${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
-    - curl "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/registry/repositories?tags=true" | grep \""${REGISTRY_DESTINATION}"\"
-    - IMAGE_EXISTS=$?
-    - ${FORCE_REBUILD_IMAGE} && echo "Force rebuilding container."
+    - IMAGE_EXISTS=`curl "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/registry/repositories?tags=true" | grep \""${REGISTRY_DESTINATION}"\"`
+    - test ${FORCE_REBUILD_IMAGE} == true && echo "Force rebuilding container."
     - >
-      if [[ ${IMAGE_EXISTS} && ! ${FORCE_REBUILD_IMAGE} ]]; then
+      if [ -z ${IMAGE_EXISTS} -a ${FORCE_REBUILD_IMAGE} == false ] ; then
         echo "Image ${IMAGE_TAG} already exists in the container registry. Skipping build."
       else
         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}
+      fi
   rules:
     - when: always
       variables:
-        FORCE_REBUILD_IMAGE: false
+        FORCE_REBUILD_IMAGE: true
     - when: manual
       variables:
-        FORCE_REBUILD_IMAGE: true
+        FORCE_REBUILD_IMAGE: false
   interruptible: false
 
 setup:containers:backend: &containers-backend