Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 1d263ab

Browse files
chinaqchinaq
committed
Merge branch 'dev' into devq
2 parents 661de66 + 3e3d11f commit 1d263ab

File tree

68 files changed

+363
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+363
-618
lines changed

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

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,14 @@ trigger:
1616
- src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
1717
- src/ApiGateways/Web.Bff.Shopping/aggregator/*
1818
jobs:
19-
- job: BuildLinux
20-
pool:
21-
vmImage: 'ubuntu-16.04'
22-
steps:
23-
- task: DockerCompose@0
24-
displayName: Compose build apigws
25-
inputs:
26-
dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
27-
containerregistrytype: Container Registry
28-
dockerRegistryEndpoint: $(registryEndpoint)
29-
dockerComposeFile: docker-compose.yml
30-
qualifyImageNames: true
31-
projectName: ""
32-
dockerComposeFileArgs: |
33-
TAG=$(Build.SourceBranchName)
34-
- task: DockerCompose@0
35-
displayName: Compose push apigws
36-
inputs:
37-
dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
38-
containerregistrytype: Container Registry
39-
dockerRegistryEndpoint: $(registryEndpoint)
40-
dockerComposeFile: docker-compose.yml
41-
qualifyImageNames: true
42-
projectName: ""
43-
dockerComposeFileArgs: |
44-
TAG=$(Build.SourceBranchName)
45-
- task: CopyFiles@2
46-
inputs:
47-
sourceFolder: $(Build.SourcesDirectory)/k8s/helm
48-
targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
49-
- task: PublishBuildArtifacts@1
50-
inputs:
51-
pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
52-
artifactName: helm
19+
- template: ../buildimages.yaml
20+
parameters:
21+
services: mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw
22+
registryEndpoint: $(registryEndpoint)
23+
helmfrom: $(Build.SourcesDirectory)/k8s/helm
24+
helmto: $(Build.ArtifactStagingDirectory)/k8s/helm
25+
- template: ../multiarch.yaml
26+
parameters:
27+
image: ocelotapigw
28+
branch: $(Build.SourceBranchName)
29+
registryEndpoint: $(registryEndpoint)

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

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
pool:
2-
vmImage: 'ubuntu-16.04'
31
variables:
42
registryEndpoint: eshop-registry
53
trigger:
@@ -12,34 +10,15 @@ trigger:
1210
- src/BuildingBlocks/*
1311
- src/Services/Basket/*
1412
- k8s/helm/basket-api/*
15-
steps:
16-
- task: DockerCompose@0
17-
displayName: Compose build basket
18-
inputs:
19-
dockerComposeCommand: 'build basket.api'
20-
containerregistrytype: Container Registry
21-
dockerRegistryEndpoint: $(registryEndpoint)
22-
dockerComposeFile: docker-compose.yml
23-
qualifyImageNames: true
24-
projectName: ""
25-
dockerComposeFileArgs: |
26-
TAG=$(Build.SourceBranchName)
27-
- task: DockerCompose@0
28-
displayName: Compose push basket
29-
inputs:
30-
dockerComposeCommand: 'push basket.api'
31-
containerregistrytype: Container Registry
32-
dockerRegistryEndpoint: $(registryEndpoint)
33-
dockerComposeFile: docker-compose.yml
34-
qualifyImageNames: true
35-
projectName: ""
36-
dockerComposeFileArgs: |
37-
TAG=$(Build.SourceBranchName)
38-
- task: CopyFiles@2
39-
inputs:
40-
sourceFolder: $(Build.SourcesDirectory)/k8s/helm
41-
targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
42-
- task: PublishBuildArtifacts@1
43-
inputs:
44-
pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
45-
artifactName: helm
13+
jobs:
14+
- template: ../buildimages.yaml
15+
parameters:
16+
services: basket.api
17+
registryEndpoint: $(registryEndpoint)
18+
helmfrom: $(Build.SourcesDirectory)/k8s/helm
19+
helmto: $(Build.ArtifactStagingDirectory)/k8s/helm
20+
- template: ../multiarch.yaml
21+
parameters:
22+
image: basket.api
23+
branch: $(Build.SourceBranchName)
24+
registryEndpoint: $(registryEndpoint)

‎build/azure-devops/buildimages.yaml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
parameters:
2+
services: ''
3+
registryEndpoint: ''
4+
helmfrom: ''
5+
helmto: ''
6+
7+
jobs:
8+
- job: BuildContainersForPR_Linux
9+
condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest')
10+
pool:
11+
vmImage: 'ubuntu-16.04'
12+
steps:
13+
- bash: docker-compose build ${{ parameters.services }}
14+
displayName: Create multiarch manifest
15+
env:
16+
TAG: ${{ variables['Build.SourceBranchName'] }}
17+
- job: BuildContainersForPR_Windows
18+
condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest')
19+
pool:
20+
vmImage: 'windows-2019'
21+
steps:
22+
- bash: docker-compose build ${{ parameters.services }}
23+
displayName: Create multiarch manifest
24+
env:
25+
TAG: ${{ variables['Build.SourceBranchName'] }}
26+
PLATFORM: win
27+
NODE_IMAGE: stefanscherer/node-windows:8.11
28+
- job: BuildLinux
29+
condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
30+
pool:
31+
vmImage: 'ubuntu-16.04'
32+
steps:
33+
- task: DockerCompose@0
34+
displayName: Compose build ${{ parameters.services }}
35+
inputs:
36+
dockerComposeCommand: 'build ${{ parameters.services }}'
37+
containerregistrytype: Container Registry
38+
dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
39+
dockerComposeFile: docker-compose.yml
40+
qualifyImageNames: true
41+
projectName: ""
42+
dockerComposeFileArgs: |
43+
TAG=${{ variables['Build.SourceBranchName'] }}
44+
- task: DockerCompose@0
45+
displayName: Compose push ${{ parameters.images }}
46+
inputs:
47+
dockerComposeCommand: 'push ${{ parameters.services }}'
48+
containerregistrytype: Container Registry
49+
dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
50+
dockerComposeFile: docker-compose.yml
51+
qualifyImageNames: true
52+
projectName: ""
53+
dockerComposeFileArgs: |
54+
TAG=${{ variables['Build.SourceBranchName'] }}
55+
- task: CopyFiles@2
56+
inputs:
57+
sourceFolder: ${{ parameters.helmfrom }}
58+
targetFolder: ${{ parameters.helmto }}
59+
- task: PublishBuildArtifacts@1
60+
inputs:
61+
pathtoPublish: ${{ parameters.helmto }}
62+
artifactName: helm
63+
- job: BuildWindows
64+
condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
65+
pool:
66+
vmImage: 'windows-2019'
67+
steps:
68+
- task: DockerCompose@0
69+
displayName: Compose build ${{ parameters.services }}
70+
inputs:
71+
dockerComposeCommand: 'build ${{ parameters.services }}'
72+
containerregistrytype: Container Registry
73+
dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
74+
dockerComposeFile: docker-compose.yml
75+
qualifyImageNames: true
76+
projectName: ""
77+
dockerComposeFileArgs: |
78+
TAG=${{ variables['Build.SourceBranchName'] }}
79+
PLATFORM=win
80+
NODE_IMAGE=stefanscherer/node-windows:8.11
81+
- task: DockerCompose@0
82+
displayName: Compose push ${{ parameters.services }}
83+
inputs:
84+
dockerComposeCommand: 'push ${{ parameters.services }}'
85+
containerregistrytype: Container Registry
86+
dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
87+
dockerComposeFile: docker-compose.yml
88+
qualifyImageNames: true
89+
projectName: ""
90+
dockerComposeFileArgs: |
91+
TAG=${{ variables['Build.SourceBranchName'] }}
92+
PLATFORM=win

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

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
pool:
2-
vmImage: 'ubuntu-16.04'
31
variables:
42
registryEndpoint: eshop-registry
53
trigger:
@@ -12,34 +10,15 @@ trigger:
1210
- src/BuildingBlocks/*
1311
- src/Services/Catalog/*
1412
- k8s/helm/catalog-api/*
15-
steps:
16-
- task: DockerCompose@0
17-
displayName: Compose build catalog
18-
inputs:
19-
dockerComposeCommand: 'build catalog.api'
20-
containerregistrytype: Container Registry
21-
dockerRegistryEndpoint: $(registryEndpoint)
22-
dockerComposeFile: docker-compose.yml
23-
qualifyImageNames: true
24-
projectName: ""
25-
dockerComposeFileArgs: |
26-
TAG=$(Build.SourceBranchName)
27-
- task: DockerCompose@0
28-
displayName: Compose push catalog
29-
inputs:
30-
dockerComposeCommand: 'push catalog.api'
31-
containerregistrytype: Container Registry
32-
dockerRegistryEndpoint: $(registryEndpoint)
33-
dockerComposeFile: docker-compose.yml
34-
qualifyImageNames: true
35-
projectName: ""
36-
dockerComposeFileArgs: |
37-
TAG=$(Build.SourceBranchName)
38-
- task: CopyFiles@2
39-
inputs:
40-
sourceFolder: $(Build.SourcesDirectory)/k8s/helm
41-
targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
42-
- task: PublishBuildArtifacts@1
43-
inputs:
44-
pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
45-
artifactName: helm
13+
jobs:
14+
- template: ../buildimages.yaml
15+
parameters:
16+
services: catalog.api
17+
registryEndpoint: $(registryEndpoint)
18+
helmfrom: $(Build.SourcesDirectory)/k8s/helm
19+
helmto: $(Build.ArtifactStagingDirectory)/k8s/helm
20+
- template: ../multiarch.yaml
21+
parameters:
22+
image: catalog.api
23+
branch: $(Build.SourceBranchName)
24+
registryEndpoint: $(registryEndpoint)

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

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
pool:
2-
vmImage: 'ubuntu-16.04'
31
variables:
42
registryEndpoint: eshop-registry
53
trigger:
@@ -12,34 +10,15 @@ trigger:
1210
- src/BuildingBlocks/*
1311
- src/Services/Identity/*
1412
- k8s/helm/identity-api/*
15-
steps:
16-
- task: DockerCompose@0
17-
displayName: Compose build identity
18-
inputs:
19-
dockerComposeCommand: 'build identity.api'
20-
containerregistrytype: Container Registry
21-
dockerRegistryEndpoint: $(registryEndpoint)
22-
dockerComposeFile: docker-compose.yml
23-
qualifyImageNames: true
24-
projectName: ""
25-
dockerComposeFileArgs: |
26-
TAG=$(Build.SourceBranchName)
27-
- task: DockerCompose@0
28-
displayName: Compose push identity
29-
inputs:
30-
dockerComposeCommand: 'push identity.api'
31-
containerregistrytype: Container Registry
32-
dockerRegistryEndpoint: $(registryEndpoint)
33-
dockerComposeFile: docker-compose.yml
34-
qualifyImageNames: true
35-
projectName: ""
36-
dockerComposeFileArgs: |
37-
TAG=$(Build.SourceBranchName)
38-
- task: CopyFiles@2
39-
inputs:
40-
sourceFolder: $(Build.SourcesDirectory)/k8s/helm
41-
targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
42-
- task: PublishBuildArtifacts@1
43-
inputs:
44-
pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
45-
artifactName: helm
13+
jobs:
14+
- template: ../buildimages.yaml
15+
parameters:
16+
services: identity.api
17+
registryEndpoint: $(registryEndpoint)
18+
helmfrom: $(Build.SourcesDirectory)/k8s/helm
19+
helmto: $(Build.ArtifactStagingDirectory)/k8s/helm
20+
- template: ../multiarch.yaml
21+
parameters:
22+
image: identity.api
23+
branch: $(Build.SourceBranchName)
24+
registryEndpoint: $(registryEndpoint)

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

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
pool:
2-
vmImage: 'ubuntu-16.04'
31
variables:
42
registryEndpoint: eshop-registry
53
trigger:
@@ -11,35 +9,16 @@ trigger:
119
include:
1210
- src/BuildingBlocks/*
1311
- src/Services/Location/*
14-
- k8s/helm/locations-api/*
15-
steps:
16-
- task: DockerCompose@0
17-
displayName: Compose build locations
18-
inputs:
19-
dockerComposeCommand: 'build locations.api'
20-
containerregistrytype: Container Registry
21-
dockerRegistryEndpoint: $(registryEndpoint)
22-
dockerComposeFile: docker-compose.yml
23-
qualifyImageNames: true
24-
projectName: ""
25-
dockerComposeFileArgs: |
26-
TAG=$(Build.SourceBranchName)
27-
- task: DockerCompose@0
28-
displayName: Compose push locations
29-
inputs:
30-
dockerComposeCommand: 'push locations.api'
31-
containerregistrytype: Container Registry
32-
dockerRegistryEndpoint: $(registryEndpoint)
33-
dockerComposeFile: docker-compose.yml
34-
qualifyImageNames: true
35-
projectName: ""
36-
dockerComposeFileArgs: |
37-
TAG=$(Build.SourceBranchName)
38-
- task: CopyFiles@2
39-
inputs:
40-
sourceFolder: $(Build.SourcesDirectory)/k8s/helm
41-
targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
42-
- task: PublishBuildArtifacts@1
43-
inputs:
44-
pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
45-
artifactName: helm
12+
- k8s/helm/locations-api/*
13+
jobs:
14+
- template: ../buildimages.yaml
15+
parameters:
16+
services: locations.api
17+
registryEndpoint: $(registryEndpoint)
18+
helmfrom: $(Build.SourcesDirectory)/k8s/helm
19+
helmto: $(Build.ArtifactStagingDirectory)/k8s/helm
20+
- template: ../multiarch.yaml
21+
parameters:
22+
image: locations.api
23+
branch: $(Build.SourceBranchName)
24+
registryEndpoint: $(registryEndpoint)

0 commit comments

Comments
 (0)