Merge pull request #54 from dotnet-architecture/dev

eShopOnContainers fork

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

@@ -16,68 +16,12 @@ trigger:
     - src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
     - src/ApiGateways/Web.Bff.Shopping/aggregator/*
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build apigws
-    inputs:
-      dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push apigws
-    inputs:
-      dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName) 
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build apigws
-    inputs:
-      dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win      
-  - task: DockerCompose@0
-    displayName: Compose push apigws
-    inputs:
-      dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win      
+- template: ../buildimages.yaml
+  parameters:
+    services: mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw
+    registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: ocelotapigw

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

@@ -11,68 +11,12 @@ trigger:
     - src/Services/Basket/*
     - k8s/helm/basket-api/*
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build basket
-    inputs:
-      dockerComposeCommand: 'build basket.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push basket
-    inputs:
-      dockerComposeCommand: 'push basket.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build basket
-    inputs:
-      dockerComposeCommand: 'build basket.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push basket
-    inputs:
-      dockerComposeCommand: 'push basket.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: basket.api
+    registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: basket.api

build/azure-devops/buildimages.yaml

@@ -0,0 +1,92 @@
+parameters:
+  services: ''
+  registryEndpoint: ''
+  helmfrom: ''
+  helmto: ''
+
+jobs:
+- job: BuildContainersForPR_Linux
+  condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest')
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - bash: docker-compose build ${{ parameters.services }}
+    displayName: Create multiarch manifest
+    env:
+      TAG: ${{ variables['Build.SourceBranchName'] }}    
+- job: BuildContainersForPR_Windows
+  condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest')
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - bash: docker-compose build ${{ parameters.services }}
+    displayName: Create multiarch manifest
+    env:
+      TAG: ${{ variables['Build.SourceBranchName'] }} 
+      PLATFORM: win
+      NODE_IMAGE: stefanscherer/node-windows:8.11
+- job: BuildLinux
+  condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build ${{ parameters.services }}
+    inputs:
+      dockerComposeCommand: 'build ${{ parameters.services }}'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=${{ variables['Build.SourceBranchName'] }}
+  - task: DockerCompose@0
+    displayName: Compose push ${{ parameters.images }}
+    inputs:
+      dockerComposeCommand: 'push ${{ parameters.services }}'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=${{ variables['Build.SourceBranchName'] }} 
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: ${{ parameters.helmfrom }}
+      targetFolder: ${{ parameters.helmto }}
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: ${{ parameters.helmto }}
+      artifactName: helm
+- job: BuildWindows
+  condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build ${{ parameters.services }}
+    inputs:
+      dockerComposeCommand: 'build ${{ parameters.services }}'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=${{ variables['Build.SourceBranchName'] }}
+        PLATFORM=win
+        NODE_IMAGE=stefanscherer/node-windows:8.11 
+  - task: DockerCompose@0
+    displayName: Compose push ${{ parameters.services }}
+    inputs:
+      dockerComposeCommand: 'push ${{ parameters.services }}'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=${{ variables['Build.SourceBranchName'] }}
+        PLATFORM=win      

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

@@ -11,68 +11,12 @@ trigger:
     - src/Services/Catalog/*
     - k8s/helm/catalog-api/*    
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build catalog
-    inputs:
-      dockerComposeCommand: 'build catalog.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push catalog
-    inputs:
-      dockerComposeCommand: 'push catalog.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindow
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build catalog
-    inputs:
-      dockerComposeCommand: 'build catalog.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push catalog
-    inputs:
-      dockerComposeCommand: 'push catalog.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: catalog.api
+    registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm
 - template: ../multiarch.yaml
   parameters:
     image: catalog.api

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

@@ -11,68 +11,12 @@ trigger:
     - src/Services/Identity/*
     - k8s/helm/identity-api/*      
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build identity
-    inputs:
-      dockerComposeCommand: 'build identity.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push identity
-    inputs:
-      dockerComposeCommand: 'push identity.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build identity
-    inputs:
-      dockerComposeCommand: 'build identity.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win   
-  - task: DockerCompose@0
-    displayName: Compose push identity
-    inputs:
-      dockerComposeCommand: 'push identity.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win   
+- template: ../buildimages.yaml
+  parameters:
+    services: identity.api
+    registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: identity.api

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

@@ -11,68 +11,12 @@ trigger:
     - src/Services/Location/*
     - k8s/helm/locations-api/*   
 jobs:
-- job: BuildLinux   
-  pool:
-    vmImage: 'ubuntu-16.04'       
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build locations
-    inputs:
-      dockerComposeCommand: 'build locations.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push locations
-    inputs:
-      dockerComposeCommand: 'push locations.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows 
-  pool:
-    vmImage: 'windows-2019'       
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build locations
-    inputs:
-      dockerComposeCommand: 'build locations.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push locations
-    inputs:
-      dockerComposeCommand: 'push locations.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: locations.api
+    registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: locations.api

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

@@ -11,68 +11,12 @@ trigger:
     - src/Services/Marketing/*
     - k8s/helm/marketing-api/*  
 jobs:
-- job: BuildLinux     
-  pool:
-    vmImage: 'ubuntu-16.04'     
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build marketing
-    inputs:
-      dockerComposeCommand: 'build marketing.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push marketing
-    inputs:
-      dockerComposeCommand: 'push marketing.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build marketing
-    inputs:
-      dockerComposeCommand: 'build marketing.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push marketing
-    inputs:
-      dockerComposeCommand: 'push marketing.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: marketing.api
+    registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: marketing.api

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

@@ -10,68 +10,12 @@ trigger:
     - src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
     - k8s/helm/mobileshoppingagg/*   
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'       
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build mobileshoppingagg
-    inputs:
-      dockerComposeCommand: 'build mobileshoppingagg'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push mobileshoppingagg
-    inputs:
-      dockerComposeCommand: 'push mobileshoppingagg'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'    
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build mobileshoppingagg
-    inputs:
-      dockerComposeCommand: 'build mobileshoppingagg'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push mobileshoppingagg
-    inputs:
-      dockerComposeCommand: 'push mobileshoppingagg'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: mobileshoppingagg
+    registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: mobileshoppingagg

build/azure-devops/multiarch.yaml

@@ -1,10 +1,15 @@
 parameters:
   image: ''
   branch: ''
+  registry: 'eshop'
   registryEndpoint: ''
 
 jobs:
 - job: manifest
+  condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
+  dependsOn:
+    - BuildWindows
+    - BuildLinux  
   pool: 
     vmImage: 'Ubuntu 16.04'
   steps:
@@ -16,12 +21,10 @@ jobs:
       dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
   - bash: |
       mkdir -p ~/.docker
-     echo '{ "experimental": "enabled" }' > ~/.docker/config.json
-     docker --config ~/.docker manifest create eshop/${{ parameters.image }}:${{ parameters.branch }} eshop/${{ parameters.image }}:linux-${{ parameters.branch }} eshop/${{ parameters.image }}:win-${{ parameters.branch }}
-     docker --config ~/.docker manifest create eshop/${{ parameters.image }}:latest eshop/${{ parameters.image }}:linux-latest eshop/${{ parameters.image }}:win-latest
-     docker --config ~/.docker push eshop/${{ parameters.image }}:${{ parameters.branch }}
-     docker --config ~/.docker push eshop/${{ parameters.image }}:latest
-    displayName: 'Create Manifest' 
-  dependsOn:
-    - BuildWindows
-    - BuildLinux
+      sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
+      echo ',"experimental": "enabled" }' >> ~/.docker/config.json
+      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:win-${{ parameters.branch }}
+      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest ${{ parameters.registry }}/${{ parameters.image }}:win-latest
+      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }}
+      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:latest
+    displayName: Create multiarch manifest

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

@@ -13,68 +13,12 @@ trigger:
     - k8s/helm/ordering-backgroundtasks/*
     - k8s/helm/ordering-signalrhub/*
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'    
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build ordering 
-    inputs:
-      dockerComposeCommand: 'build ordering.api ordering.backgroundtasks ordering.signalrhub'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push ordering
-    inputs:
-      dockerComposeCommand: 'push ordering.api ordering.backgroundtasks ordering.signalrhub'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build ordering 
-    inputs:
-      dockerComposeCommand: 'build ordering.api ordering.backgroundtasks ordering.signalrhub'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push ordering
-    inputs:
-      dockerComposeCommand: 'push ordering.api ordering.backgroundtasks ordering.signalrhub'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: ordering.api
+    registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: ordering.api

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

@@ -11,68 +11,12 @@ trigger:
     - src/Services/Payment/*
     - k8s/helm/payment-api/*  
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'    
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build payment
-    inputs:
-      dockerComposeCommand: 'build payment.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push payment
-    inputs:
-      dockerComposeCommand: 'push payment.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build payment
-    inputs:
-      dockerComposeCommand: 'build payment.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win 
-  - task: DockerCompose@0
-    displayName: Compose push payment
-    inputs:
-      dockerComposeCommand: 'push payment.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win 
+- template: ../buildimages.yaml
+  parameters:
+    services: payment.api
+    registryEndpoint: $(registryEndpoint) 
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: payment.api

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

@@ -10,68 +10,12 @@ trigger:
     - src/ApiGateways/Web.Bff.Shopping/aggregator/*
     - k8s/helm/webshoppingagg/* 
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webshoppingagg
-    inputs:
-      dockerComposeCommand: 'build webshoppingagg'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push webshoppingagg
-    inputs:
-      dockerComposeCommand: 'push webshoppingagg'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webshoppingagg
-    inputs:
-      dockerComposeCommand: 'build webshoppingagg'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push webshoppingagg
-    inputs:
-      dockerComposeCommand: 'push webshoppingagg'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: webshoppingagg
+    registryEndpoint: $(registryEndpoint) 
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: webshoppingagg

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

@@ -11,68 +11,12 @@ trigger:
     - src/Services/Webhooks/*
     - k8s/helm/webhooks-api/*
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04' 
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webhooks
-    inputs:
-      dockerComposeCommand: 'build webhooks.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push webhooks
-    inputs:
-      dockerComposeCommand: 'push webhooks.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webhooks
-    inputs:
-      dockerComposeCommand: 'build webhooks.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push webhooks
-    inputs:
-      dockerComposeCommand: 'push webhooks.api'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: webhooks.api
+    registryEndpoint: $(registryEndpoint) 
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: webhooks.api

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

@@ -11,68 +11,12 @@ trigger:
     - src/Web/WebhookClient/*
     - k8s/helm/webhooks-web/*  
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'    
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webhooks.client
-    inputs:
-      dockerComposeCommand: 'build webhooks.client'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push webhooks.client
-    inputs:
-      dockerComposeCommand: 'push webhooks.client'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webhooks.client
-    inputs:
-      dockerComposeCommand: 'build webhooks.client'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push webhooks.client
-    inputs:
-      dockerComposeCommand: 'push webhooks.client'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)v
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: webhooks.client
+    registryEndpoint: $(registryEndpoint) 
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm    
 - template: ../multiarch.yaml
   parameters:
     image: webhooks.client

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

@@ -11,68 +11,10 @@ trigger:
     - src/Web/WebMVC/*
     - k8s/helm/webmvc/*    
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'    
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webmvc
-    inputs:
-      dockerComposeCommand: 'build webmvc'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push webmvc
-    inputs:
-      dockerComposeCommand: 'push webmvc'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webmvc
-    inputs:
-      dockerComposeCommand: 'build webmvc'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push webmvc
-    inputs:
-      dockerComposeCommand: 'push webmvc'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: webmvc
+    registryEndpoint: $(registryEndpoint) 
 - template: ../multiarch.yaml
   parameters:
     image: webmvc

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

@@ -11,70 +11,10 @@ trigger:
     - src/Web/WebSPA/*
     - k8s/helm/webspa/*            
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webspa
-    inputs:
-      dockerComposeCommand: 'build webspa'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push webspa
-    inputs:
-      dockerComposeCommand: 'push webspa'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webspa
-    inputs:
-      dockerComposeCommand: 'build webspa'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        NODE_IMAGE=stefanscherer/node-windows:8.11
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push webspa
-    inputs:
-      dockerComposeCommand: 'push webspa'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-        NODE_IMAGE=stefanscherer/node-windows:8.11
+- template: ../buildimages.yaml
+  parameters:
+    services: webspa
+    registryEndpoint: $(registryEndpoint)          
 - template: ../multiarch.yaml
   parameters:
     image: webspa

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

@@ -11,68 +11,10 @@ trigger:
     - src/Web/WebStatus/*
     - k8s/helm/webstatus/* 
 jobs:
-- job: BuildLinux
-  pool:
-    vmImage: 'ubuntu-16.04'       
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webstatus
-    inputs:
-      dockerComposeCommand: 'build webstatus'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: DockerCompose@0
-    displayName: Compose push webstatus
-    inputs:
-      dockerComposeCommand: 'push webstatus'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
-      artifactName: helm
-- job: BuildWindows
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build webstatus
-    inputs:
-      dockerComposeCommand: 'build webstatus'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
-  - task: DockerCompose@0
-    displayName: Compose push webstatus
-    inputs:
-      dockerComposeCommand: 'push webstatus'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: $(registryEndpoint)
-      dockerComposeFile: docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=$(Build.SourceBranchName)
-        PLATFORM=win
+- template: ../buildimages.yaml
+  parameters:
+    services: webstatus
+    registryEndpoint: $(registryEndpoint)         
 - template: ../multiarch.yaml
   parameters:
     image: webstatus

readme/readme.md

@@ -7,7 +7,7 @@ This file contains links to the documentation of the project.
 ## Documentation included in files
 
 * [Branch Guide](../branch-guide.md): List of branches used and their purpose.
-* [vsts-docs folder](../vsts-docs/readme.md): Information about how to setup a CI/CD procedure using VSTS
+* [vsts-docs folder](../vsts-docs/readme.md): Information about how to setup a CI/CD procedure using Azure DevOps
 * [Kubernetes](../k8s/readme.md): Information about how to deploy eShopOnContainers in a kubernetes cluster, and how to setup a CI/CD for k8s using VSTS
 * [deploy](../deploy/readme.md): Information about how deploy Azure resources using the Azure CLI 2.0.
 * [.env file](./README.ENV.md): What is the `.env` file and how to use it to configure eShopOnContainers to use external resources (like Azure)

src/Services/Ordering/Ordering.UnitTests/Application/OrdersWebApiTest.cs

@@ -31,7 +31,7 @@ namespace UnitTest.Ordering.Application
         }
 
         [Fact]
-        public async Task Create_order_with_requestId_success()
+        public async Task Cancel_order_with_requestId_success()
         {
             //Arrange
             _mediatorMock.Setup(x => x.Send(It.IsAny<IdentifiedCommand<CancelOrderCommand, bool>>(), default(CancellationToken)))