From e84e7e57d8805586396d1e4d1ad1f55e82532b05 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Tue, 21 Jan 2025 17:14:47 +0100
Subject: [PATCH] ci(azure-pipelines): fix templating contd

---
 .azure-pipelines/templates/build-image.yaml | 9 ++++-----
 azure-pipelines.yaml                        | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/templates/build-image.yaml b/.azure-pipelines/templates/build-image.yaml
index 7220c4b8d..f0ad2a5f7 100644
--- a/.azure-pipelines/templates/build-image.yaml
+++ b/.azure-pipelines/templates/build-image.yaml
@@ -7,7 +7,6 @@ parameters:
     type: object
     default:
       name: service
-      targetImage: devfra.azurecr.io/de.fraport.fradrive.build/${{parameters.service.name}}
       baseImage: baseImage
       baseImageTag: baseImageTag
       extraBuildOptions: ''
@@ -33,7 +32,7 @@ jobs:
           script: |
             cp docker/${{parameters.service.name}}/Dockerfile .
             docker build \
-            --tag ${{parameters.service.targetImage}}:$(Build.BuildNumber) \
+            --tag $(imageUpstream)/${{parameters.service.name}}:$(Build.BuildNumber) \
             --build-arg FROM_IMG=${{parameters.service.baseImage}} \
             --build-arg FROM_TAG=${{parameters.service.baseImageTag}} \
             --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
@@ -51,15 +50,15 @@ jobs:
         inputs:
           targetType: inline
           script: |
-            docker push ${{parameters.service.targetImage}}:$(Build.BuildNumber)
+            docker push $(imageUpstream)/${{parameters.service.name}}:$(Build.BuildNumber)
       - task: Bash@3
         displayName: Update latest ${{parameters.service.name}} image
         # condition: eq(variables.onMasterBranch, true)
         inputs:
           targetType: inline
           script: |
-            docker tag ${{parameters.service.targetImage}}:$(Build.BuildNumber) ${{parameters.service.targetImage}}:latest
-            docker push ${{parameters.service.targetImage}}:latest
+            docker tag $(imageUpstream)/${{parameters.service.name}}:$(Build.BuildNumber) $(imageUpstream)/${{parameters.service.name}}:latest
+            docker push $(imageUpstream)/${{parameters.service.name}}:latest
       - task: Docker@2
         displayName: Logout from container registry
         inputs:
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index edea9e819..b9efe9ddb 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -7,13 +7,13 @@ parameters:
     type: object
     default:
       - name: frontend
-        targetImage: devfra.azurecr.io/de.fraport.fradrive.build/frontend
         baseImage: devfra.azurecr.io/de.fraport.build/npm
         baseImageTag: node-20
         extraBuildOptions: |
           --build-arg NPM_CUSTOM_REGISTRY=https://pkgs.dev.azure.com/fraport/_packaging/packages/npm/registry/
 
 variables:
+  imageUpstream: devfra.azurecr.io/de.fraport.fradrive.build
   onMasterBranch: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')]
   onUpdateBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/update')]