ci(azure-pipelines): imageUpstream -> buildImageUpstream [skip ci]

This commit is contained in:
Sarah Vaupel 2025-02-06 17:30:27 +01:00
parent 32f449ec12
commit cfb48b6a1c
2 changed files with 6 additions and 6 deletions

View File

@ -59,7 +59,7 @@ stages:
script: | script: |
cp docker/${{parameters.serviceName}}/Dockerfile . cp docker/${{parameters.serviceName}}/Dockerfile .
docker build \ docker build \
--tag $(imageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) \ --tag $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) \
--build-arg FROM_IMG=${{parameters.serviceBase.image}} \ --build-arg FROM_IMG=${{parameters.serviceBase.image}} \
--build-arg FROM_TAG=${{parameters.serviceBase.tag}} \ --build-arg FROM_TAG=${{parameters.serviceBase.tag}} \
--build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \ --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
@ -75,15 +75,15 @@ stages:
inputs: inputs:
targetType: inline targetType: inline
script: | script: |
docker push $(imageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) docker push $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
- task: Bash@3 - task: Bash@3
displayName: Update latest ${{parameters.serviceName}} image displayName: Update latest ${{parameters.serviceName}} image
condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true)) condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true))
inputs: inputs:
targetType: inline targetType: inline
script: | script: |
docker tag $(imageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) $(imageUpstream)/${{parameters.serviceName}}:latest docker tag $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) $(buildImageUpstream)/${{parameters.serviceName}}:latest
docker push $(imageUpstream)/${{parameters.serviceName}}:latest docker push $(buildImageUpstream)/${{parameters.serviceName}}:latest
- task: Docker@2 - task: Docker@2
displayName: Logout from container registry displayName: Logout from container registry
inputs: inputs:
@ -99,7 +99,7 @@ stages:
container: container:
# TODO: use BuildNumber instead of latest in update branches # TODO: use BuildNumber instead of latest in update branches
# image: devfra.azurecr.io/de.fraport.fradrive.build/frontend:$(Build.BuildNumber) # image: devfra.azurecr.io/de.fraport.fradrive.build/frontend:$(Build.BuildNumber)
image: $(imageUpstream)/${{parameters.serviceName}}:latest image: $(buildImageUpstream)/${{parameters.serviceName}}:latest
endpoint: devfra endpoint: devfra
env: env:
PROJECT_DIR: $(Build.Repository.LocalPath) PROJECT_DIR: $(Build.Repository.LocalPath)

View File

@ -52,7 +52,7 @@ parameters:
.stack-work/**/* .stack-work/**/*
variables: variables:
imageUpstream: devfra.azurecr.io/de.fraport.fradrive.build buildImageUpstream: devfra.azurecr.io/de.fraport.fradrive.build
onMasterBranch: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] onMasterBranch: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')]
onUpdateBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/update')] onUpdateBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/update')]