make ceos tag pipeline specific

build/ci/.build-container.yml

@@ -22,6 +22,7 @@ variables:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker push $DOCKER_IMAGE_SHA
     - docker tag $DOCKER_IMAGE_SHA $TAG
+    - docker tag $DOCKER_IMAGE_SHA registry.code.fbi.h-da.de/cocsn/gosdn:${CI_PIPELINE_ID}
     - docker push $TAG
 
 build:develop:

build/ci/.terraform-ci.yml

@@ -21,6 +21,7 @@ cache:
     - export TF_VAR_integration_access_token=${TERRAFORM_API_TOKEN}
     - export TF_VAR_integration_registry=${CI_REGISTRY}
     - export TF_VAR_ceos_tag=registry.code.fbi.h-da.de/cocsn/gosdn/ceos:${CI_PIPELINE_ID}
+    - export TF_VAR_container_tag=registry.code.fbi.h-da.de/cocsn/gosdn:${CI_PIPELINE_ID}
     - export TF_VAR_tls_key=${DOCKER_TLS_KEY}
     - export TF_VAR_tls_cert=${DOCKER_TLS_CERT}
     - export TF_VAR_tls_ca_cert=${DOCKER_TLS_CA}
@@ -28,8 +29,6 @@ cache:
     - export TF_VAR_gosdn_address=172.24.$(cat secondOctet).$(cat firstOctet)
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop')
-      variables:
-        TF_VAR_container_tag: $DOCKER_IMAGE_SHA
     - if: $CI_COMMIT_BRANCH == "integration-test"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_NIGHTLY