urls in variables

.gitlab-ci.yml

@@ -5,6 +5,8 @@ stages:
 variables:
   REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne
   IMAGE_NAME: $REGISTRY/$CI_PROJECT_NAME
+  DTRACK_API_URL: https://dtrack-api-rd.krohne.com
+  DEFECTDOJO_API_URL: https://defectdojo-rd.krohne.com
 
 
 generate-dtrack-api:
@@ -16,12 +18,13 @@ generate-dtrack-api:
     - bash
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_TAG'
   artifacts:
     paths:
       - dtrack-api-client.tgz
     expire_in: 1 week
   script:
-    - curl https://dtrack-api.hottis.de/api/openapi.json > dependencytrack-openapi.json
+    - curl ${DTRACK_API_URL}/api/openapi.json > dependencytrack-openapi.json
     - |
       docker-entrypoint.sh \
       author template \
@@ -49,12 +52,13 @@ generate-defectdojo-api:
     - bash
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_TAG'
   artifacts:
     paths:
       - defectdojo-api-client.tgz
     expire_in: 1 week
   script:
-    - curl https://defectdojo.hottis.de/api/v2/oa3/schema/?format=json > defectdojo-openapi.json
+    - curl ${DEFECTDOJO_API_URL}/api/v2/oa3/schema/?format=json > defectdojo-openapi.json
     - |
       docker-entrypoint.sh \
       generate \
@@ -74,14 +78,16 @@ dockerize:
   rules:
     - if: '$CI_COMMIT_TAG'
   script:
-        - docker build --tag $IMAGE_NAME:latest 
-                       --tag $IMAGE_NAME:$CI_COMMIT_SHA
-                       --tag $IMAGE_NAME:$CI_COMMIT_TAG
-                       .
-        - docker login -u $NEXUS_USER -p $NEXUS_PASSWORD $REGISTRY
-        - docker push $IMAGE_NAME:latest
-        - docker push $IMAGE_NAME:$CI_COMMIT_SHA
-        - docker push $IMAGE_NAME:$CI_COMMIT_TAG
+    - tar -xzf defectdojo-api-client.tgz
+    - tar -xzf dtrack-api-client.tgz
+    - docker build --tag $IMAGE_NAME:latest 
+                   --tag $IMAGE_NAME:$CI_COMMIT_SHA
+                   --tag $IMAGE_NAME:$CI_COMMIT_TAG
+                   .
+    - docker login -u $NEXUS_USER -p $NEXUS_PASSWORD $REGISTRY
+    - docker push $IMAGE_NAME:latest
+    - docker push $IMAGE_NAME:$CI_COMMIT_SHA
+    - docker push $IMAGE_NAME:$CI_COMMIT_TAG