fix image name confusion

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 
 variables:
   REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne
-  IMAGE_NAME: $REGISTRY/$CI_PROJECT_NAME
+  IMAGE_NAME_PREFIX: $REGISTRY/$CI_PROJECT_NAME
   DTRACK_API_URL: https://dtrack-api-rd.krohne.com
   DEFECTDOJO_API_URL: https://defectdojo-rd.krohne.com
   KROHNE_CA_URL: https://devwiki.krohnegroup.com/lib/exe/fetch.php?media=krohne-ca.crt
@@ -77,40 +77,38 @@ generate-defectdojo-api:
     - docker
     - bash
   rules:
-    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "production_deployment"'
   script:
     - docker build --build-arg ADDITIONAL_CA_URL="$KROHNE_CA_URL"
                    --build-arg ADDITIONAL_CA_CHECKSUM=$KROHNE_CA_CHECKSUM
-                   --tag $IMAGE_NAME:latest 
+                   --tag $IMAGE_NAME:latest-$CI_COMMIT_BRANCH
                    --tag $IMAGE_NAME:$CI_COMMIT_SHA
-                   --tag $IMAGE_NAME:$CI_COMMIT_TAG
                    -f $DOCKERFILE 
                    .
     - docker login -u $NEXUS_USER -p $NEXUS_PASSWORD $REGISTRY
-    - docker push $IMAGE_NAME:latest
+    - docker push $IMAGE_NAME:latest-$CI_COMMIT_BRANCH
     - docker push $IMAGE_NAME:$CI_COMMIT_SHA
-    - docker push $IMAGE_NAME:$CI_COMMIT_TAG
 
 dockerize-cli:
   extends: .dockerize
   variables:
+    IMAGE_NAME_SUFFIX: cli
     DOCKERFILE: Dockerfile-cli
 
 dockerize-server:
   extends: .dockerize
   variables:
+    IMAGE_NAME_SUFFIX: server
     DOCKERFILE: Dockerfile-server
 
 .deploy:
   stage: deploy
-  image: wollud1969/docker-bash:latest
   image: devnexus.krohne.com:18079/repository/docker-krohne/krohnedockerbash:0.5
   variables:
     GIT_STRATEGY: none
     SERVICE: sbom-dd-dt-integrator
-  dependencies:
-    - dockerize
   script:
+    - IMAGE_NAME=$IMAGE_NAME_PREFIX"-server"
     - VERSION=$CI_COMMIT_SHA
     - CONTAINER_NAME=$SERVICE"-"$INSTANCE_SPECIFIER
     - SERVICE_VOLUME=$SERVICE"-"$INSTANCE_SPECIFIER"-data"
@@ -123,7 +121,8 @@ dockerize-server:
       cat - > /start-scripts/${CONTAINER_NAME}.sh << EOT
         docker run \
           -d \
-          --restart always
+          --restart always \
+          -p 4701:8000 \
           --name $CONTAINER_NAME \
           -e DTRACK_API_URL=$DTRACK_API_URL \
           -e DTRACK_TOKEN=$DTRACK_TOKEN \
@@ -136,9 +135,8 @@ dockerize-server:
 
 deploy-test:
   extends: .deploy
-  only:
-    refs:
-      - master
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
   tags:
     -  test-deployment-de01rdtst01
   variables:
@@ -148,9 +146,8 @@ deploy-test:
 
 deploy-dev:
   extends: .deploy
-  only:
-    refs:
-      - production_deployment
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "production_deployment"'
   tags:
     - for-common-services-prod-deployment-only
   variables: