fix script #2

.gitlab-ci.yml

@@ -218,6 +218,10 @@ docker-nvidia-no-db-build:
   # Use the official docker image.
   image: docker:latest
   stage: build
+  variables:
+    ARCH_TYPE: "nvidia"
+    INCLUDE_DB: false
+    DOCKER_FILE: "Dockerfile.nvidia"
   services:
     - docker:dind
   before_script:
@@ -226,31 +230,22 @@ docker-nvidia-no-db-build:
   # All other branches are tagged with the escaped branch name (commit ref slug)
   script:
     - |
-      arch="nvidia" ;
-      branch="" ; 
-      no_db=true ; 
-      no_db_tag = "" ;
-      docker_file_ext="" ;
-
-      if [[ "${arch}" != "" ]]; then
-        docker_file_ext=".${arch}"
-      fi 
-
+      export BRANCH_PREFIX="" ; 
+      export NO_DB_SUFIX="" ;
+      
       if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
-        branch="${CI_COMMIT_REF_SLUG}-"
+        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}-" ;
       fi 
 
-      if [[ "${no_db}" == "true" ]]; then
-        no_db_tag="-no-db"
+      if [[ "${INCLUDE_DB}" == "true" ]]; then
+        export NO_DB_SUFIX="-no-db" ;
       fi
 
-      tag=":${branch}${arch}${no_db_tag}" ;
-      
-      image_tag="$CI_REGISTRY_IMAGE${tag}" ;
-      echo "Running on branch '${CI_COMMIT_BRANCH}', Tag: ${tag}, Image: ${image_tag}" ;
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}" ;
+      echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${no_db}" -t "${image_tag}" . -f "Dockerfile${docker_file_ext}"
-    - docker push "${image_tag}"
+    - docker build --pull --build-arg VAR_EXCLUDE_DB="${INCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker push "${IMAGE_NAME}"
   # Run this job in a branch where a Dockerfile exists
   rules:
     # - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"