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

Commit a219380

Browse files
mvelosopmvelosop
committed
Merge branch 'dev'
2 parents 8ca327f + 897c924 commit a219380

File tree

489 files changed

+23916
-40850
lines changed

Some content is hidden

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

489 files changed

+23916
-40850
lines changed

‎.dockerignore‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@
55
.vs
66
.vscode
77
docker-compose*.yml
8-
docker-compose.dcproj
9-
*.sln
10-
!eShopOnContainers-ServicesAndWebApps.sln
118
*.md
129
hosts
1310
LICENSE
1411
*.testsettings
1512
vsts-docs
16-
test
1713
ServiceFabric
1814
readme
1915
k8s
@@ -31,4 +27,13 @@ cli-linux
3127
**/wwwroot/lib/*
3228
global.json
3329
**/appsettings.localhost.json
34-
src/Web/WebSPA/wwwroot/
30+
src/Web/WebSPA/wwwroot/
31+
packages/
32+
csproj-files/
33+
test-results/
34+
TestResults/
35+
src/Mobile/
36+
src/Web/Catalog.WebForms/
37+
src/Web/WebMonolithic/
38+
src/BuildingBlocks/CommandBus/
39+
src/Services/Marketing/Infrastructure/

‎.gitignore‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ bld/
2626
# Visual Studio 2015 cache/options directory
2727
.vs/
2828

29+
# Dockerfile projects folder for restore-packages script
30+
csproj-files/
31+
2932
# .js files created on build:
3033
src/Web/WebMVC/wwwroot/js/site*
3134

@@ -42,6 +45,8 @@ src/Web/WebMVC/wwwroot/js/site*
4245
*.VisualState.xml
4346
TestResult.xml
4447

48+
tests-results/
49+
4550
# Build Results of an ATL Project
4651
[Dd]ebugPS/
4752
[Rr]eleasePS/
@@ -269,4 +274,9 @@ pub/
269274
.mfractor
270275

271276
# Ignore HealthCheckdb
272-
*healthchecksdb*
277+
*healthchecksdb*
278+
279+
# Ignores all extra inf.yaml and app.yaml that are copied by prepare-devspaces.ps1
280+
src/**/app.yaml
281+
src/**/inf.yaml
282+

‎README.md‎

Lines changed: 38 additions & 73 deletions
Large diffs are not rendered by default.

‎build/azure-devops/apigws/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:
@@ -17,34 +15,15 @@ trigger:
1715
exclude:
1816
- src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
1917
- src/ApiGateways/Web.Bff.Shopping/aggregator/*
20-
steps:
21-
- task: DockerCompose@0
22-
displayName: Compose build apigws
23-
inputs:
24-
dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
25-
containerregistrytype: Container Registry
26-
dockerRegistryEndpoint: $(registryEndpoint)
27-
dockerComposeFile: docker-compose.yml
28-
qualifyImageNames: true
29-
projectName: ""
30-
dockerComposeFileArgs: |
31-
TAG=$(Build.SourceBranchName)
32-
- task: DockerCompose@0
33-
displayName: Compose push apigws
34-
inputs:
35-
dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
36-
containerregistrytype: Container Registry
37-
dockerRegistryEndpoint: $(registryEndpoint)
38-
dockerComposeFile: docker-compose.yml
39-
qualifyImageNames: true
40-
projectName: ""
41-
dockerComposeFileArgs: |
42-
TAG=$(Build.SourceBranchName)
43-
- task: CopyFiles@2
44-
inputs:
45-
sourceFolder: $(Build.SourcesDirectory)/k8s/helm
46-
targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
47-
- task: PublishBuildArtifacts@1
48-
inputs:
49-
pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
50-
artifactName: helm
18+
jobs:
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:10
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:10
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/infrastructure/azure-pipelines.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
pool:
2+
vmImage: 'ubuntu-16.04'
3+
variables:
4+
registryEndpoint: eshop-registry
5+
trigger:
6+
branches:
7+
include:
8+
- master
9+
- dev
10+
paths:
11+
include:
12+
- k8s/helm/basket-data/*
13+
- k8s/helm/keystore-data/*
14+
- k8s/helm/nosql-data/*
15+
- k8s/helm/rabbitmq/*
16+
- k8s/helm/sql-data/*
17+
steps:
18+
- task: CopyFiles@2
19+
inputs:
20+
sourceFolder: $(Build.SourcesDirectory)/k8s/helm
21+
targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
22+
- task: PublishBuildArtifacts@1
23+
inputs:
24+
pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
25+
artifactName: helm

0 commit comments

Comments
 (0)