builds updated

build/azure-devops/apigws/azure-pipelines.yml

@@ -12,11 +12,10 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
-  displayName: Compose push basket
+  displayName: Compose push apigws
   inputs:
     dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
     containerregistrytype: Container Registry
@@ -24,9 +23,9 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    additionalImageTags: 
+    dockerComposeFileArgs: |
+      TAG=dev        
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/basket-api/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push basket
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/catalog-api/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push catalog
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/identity-api/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push identity
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/location-api/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push locations
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/marketing-api/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push marketing
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/mobile-shopping-agg/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push mobileshoppingagg
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/ordering-api/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push ordering
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/payment-api/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push payment
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/web-shopping-agg/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push webshoppingagg
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/webhooks-api/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push webhooks
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/webhooks-client/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push webhooks.client
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/webmvc/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push webmvc
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/webspa/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push webspa
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm    

build/azure-devops/webstatus/azure-pipelines.yml

@@ -12,9 +12,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: DockerCompose@0
   displayName: Compose push webstatus
   inputs:
@@ -24,9 +23,8 @@ steps:
     dockerComposeFile: docker-compose.yml
     qualifyImageNames: true
     projectName: ""
-    additionalImageTags: |
-     $(Build.BuildId)
-     dev
+    dockerComposeFileArgs: |
+      TAG=dev
 - task: CopyFiles@2
   inputs:
     sourceFolder: $(Build.SourcesDirectory)/k8s/helm