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:
@@ -22,7 +24,7 @@ generate-dtrack-api:
       - 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 \
@@ -56,7 +58,7 @@ generate-defectdojo-api:
       - 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 \
@@ -82,8 +84,7 @@ dockerize:
                    --tag $IMAGE_NAME:$CI_COMMIT_SHA
                    --tag $IMAGE_NAME:$CI_COMMIT_TAG
                    .
-    - echo docker login -u $NEXUS_DOCKER_USER -p $NEXUS_DOCKER_PASSWORD $REGISTRY
+    - docker login -u $NEXUS_USER -p $NEXUS_PASSWORD $REGISTRY
-    - echo "TRIVY_URL:$TRIVY_URL"
     - docker push $IMAGE_NAME:latest
     - docker push $IMAGE_NAME:$CI_COMMIT_SHA
     - docker push $IMAGE_NAME:$CI_COMMIT_TAG