fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci(azure-pipelines): fix templating contd

Browse Source
This commit is contained in:
Sarah Vaupel 2025-01-21 17:14:47 +01:00
parent b51caba851
commit e84e7e57d8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.azure-pipelines/templates/build-image.yaml
View File

@ -7,7 +7,6 @@ parameters:
type: object type: object
default: default:
name: service name: service
targetImage: devfra.azurecr.io/de.fraport.fradrive.build/${{parameters.service.name}}
baseImage: baseImage baseImage: baseImage
baseImageTag: baseImageTag baseImageTag: baseImageTag
extraBuildOptions: '' extraBuildOptions: ''
@ -33,7 +32,7 @@ jobs:
script: | script: |
cp docker/${{parameters.service.name}}/Dockerfile . cp docker/${{parameters.service.name}}/Dockerfile .
docker build \ 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_IMG=${{parameters.service.baseImage}} \
--build-arg FROM_TAG=${{parameters.service.baseImageTag}} \ --build-arg FROM_TAG=${{parameters.service.baseImageTag}} \
--build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \ --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
@ -51,15 +50,15 @@ jobs:
inputs: inputs:
targetType: inline targetType: inline
script: | script: |
docker push ${{parameters.service.targetImage}}:$(Build.BuildNumber) docker push $(imageUpstream)/${{parameters.service.name}}:$(Build.BuildNumber)
- task: Bash@3 - task: Bash@3
displayName: Update latest ${{parameters.service.name}} image displayName: Update latest ${{parameters.service.name}} image
# condition: eq(variables.onMasterBranch, true) # condition: eq(variables.onMasterBranch, true)
inputs: inputs:
targetType: inline targetType: inline
script: | script: |
docker tag ${{parameters.service.targetImage}}:$(Build.BuildNumber) ${{parameters.service.targetImage}}:latest docker tag $(imageUpstream)/${{parameters.service.name}}:$(Build.BuildNumber) $(imageUpstream)/${{parameters.service.name}}:latest
docker push ${{parameters.service.targetImage}}:latest docker push $(imageUpstream)/${{parameters.service.name}}:latest
- task: Docker@2 - task: Docker@2
displayName: Logout from container registry displayName: Logout from container registry
inputs: inputs:

2
azure-pipelines.yaml
View File

@ -7,13 +7,13 @@ parameters:
type: object type: object
default: default:
- name: frontend - name: frontend
targetImage: devfra.azurecr.io/de.fraport.fradrive.build/frontend
baseImage: devfra.azurecr.io/de.fraport.build/npm baseImage: devfra.azurecr.io/de.fraport.build/npm
baseImageTag: node-20 baseImageTag: node-20
extraBuildOptions: | extraBuildOptions: |
--build-arg NPM_CUSTOM_REGISTRY=https://pkgs.dev.azure.com/fraport/_packaging/packages/npm/registry/ --build-arg NPM_CUSTOM_REGISTRY=https://pkgs.dev.azure.com/fraport/_packaging/packages/npm/registry/
variables: variables:
imageUpstream: 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')]