Merge branch 'feature/docker-multi-label' into develop

This commit is contained in:
Michael Auer
2022-12-15 16:46:00 +01:00
6 changed files with 12 additions and 9 deletions

View File

@@ -121,12 +121,13 @@ jobs:
command: 'build' command: 'build'
Dockerfile: Dockerfile Dockerfile: Dockerfile
buildContext: buildContext:
tags: 'debug-$(Build.BuildNumber)-$(Build.SourceVersion)' tags: '$(Build.BuildNumber)-$(Build.SourceVersion)'
arguments: | arguments: |
--no-cache --no-cache
--target publish --target publish
--build-arg SEMVERSION=$(Major).$(Minor).$(Patch) --build-arg SEMVERSION=$(Major).$(Minor).$(Patch)
--build-arg BuildUniqueID=$(BuildUniqueID) --build-arg BuildUniqueID=$(BuildUniqueID)
--label BuildType=Debug
- task: Docker@2 - task: Docker@2
displayName: 'push ISAClient Debug' displayName: 'push ISAClient Debug'
@@ -134,7 +135,7 @@ jobs:
containerRegistry: 'Harbor isa' containerRegistry: 'Harbor isa'
repository: 'isa/ui' repository: 'isa/ui'
command: 'push' command: 'push'
tags: 'debug-$(Build.BuildNumber)-$(Build.SourceVersion)' tags: '$(Build.BuildNumber)-$(Build.SourceVersion)'
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
displayName: 'Artefakt veröffentlichen: HelmValues' displayName: 'Artefakt veröffentlichen: HelmValues'
@@ -182,13 +183,14 @@ jobs:
command: 'build' command: 'build'
Dockerfile: Dockerfile Dockerfile: Dockerfile
buildContext: buildContext:
tags: 'prod-$(Build.BuildNumber)-$(Build.SourceVersion)' tags: '$(Build.BuildNumber)-$(Build.SourceVersion)'
arguments: | arguments: |
--no-cache --no-cache
--target publish --target publish
--build-arg IS_PRODUCTION=true --build-arg IS_PRODUCTION=true
--build-arg SEMVERSION=$(Major).$(Minor).$(Patch) --build-arg SEMVERSION=$(Major).$(Minor).$(Patch)
--build-arg BuildUniqueID=$(BuildUniqueID) --build-arg BuildUniqueID=$(BuildUniqueID)
--label BuildType=Production
- task: Docker@2 - task: Docker@2
displayName: 'push ISAClient Prod' displayName: 'push ISAClient Prod'
@@ -196,7 +198,8 @@ jobs:
containerRegistry: 'Harbor isa' containerRegistry: 'Harbor isa'
repository: 'isa/ui' repository: 'isa/ui'
command: 'push' command: 'push'
tags: 'prod-$(Build.BuildNumber)-$(Build.SourceVersion)' tags: '$(Build.BuildNumber)-$(Build.SourceVersion)'
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
displayName: 'Artefakt veröffentlichen: HelmValues' displayName: 'Artefakt veröffentlichen: HelmValues'

View File

@@ -1,7 +1,7 @@
fullnameOverride: isa-ui-feature fullnameOverride: isa-ui-feature
image: image:
harborRepo: isa/ui harborRepo: isa/ui
tag: debug-%BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION% tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%
ingress: ingress:
enabled: true enabled: true

View File

@@ -1,7 +1,7 @@
fullnameOverride: isa-ui fullnameOverride: isa-ui
image: image:
harborRepo: isa/ui harborRepo: isa/ui
tag: prod-%BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION% tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%
ingress: ingress:
enabled: true enabled: true

View File

@@ -1,7 +1,7 @@
fullnameOverride: isa-ui fullnameOverride: isa-ui
image: image:
harborRepo: isa/ui harborRepo: isa/ui
tag: prod-%BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION% tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%
replicaCount: 2 replicaCount: 2

View File

@@ -1,7 +1,7 @@
fullnameOverride: isa-ui fullnameOverride: isa-ui
image: image:
harborRepo: isa/ui harborRepo: isa/ui
tag: prod-%BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION% tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%
replicaCount: 2 replicaCount: 2

View File

@@ -1,7 +1,7 @@
fullnameOverride: isa-ui fullnameOverride: isa-ui
image: image:
harborRepo: isa/ui harborRepo: isa/ui
tag: debug-%BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION% tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%
ingress: ingress:
enabled: true enabled: true