Skip to content

Commit 3f0c467

Browse files
TarasKovalenkoTarasKovalenko
authored
Merge pull request dotnet-architecture#51 from dotnet-architecture/dev
eShopOnContainers fork
2 parents 4d76ba4 + 7b300ec commit 3f0c467

85 files changed

Lines changed: 1225 additions & 963 deletions

File tree

Some content is hidden

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

‎.dockerignore‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
docker-compose*.yml
88
docker-compose.dcproj
99
*.sln
10-
!eShopOnContainers-ServicesAndWebApps.sln
1110
*.md
1211
hosts
1312
LICENSE
@@ -31,4 +30,13 @@ cli-linux
3130
**/wwwroot/lib/*
3231
global.json
3332
**/appsettings.localhost.json
34-
src/Web/WebSPA/wwwroot/
33+
src/Web/WebSPA/wwwroot/
34+
packages/
35+
csproj-files/
36+
test-results/
37+
TestResults/
38+
src/Mobile/
39+
src/Web/Catalog.WebForms/
40+
src/Web/WebMonolithic/
41+
src/BuildingBlocks/CommandBus/
42+
src/Services/Marketing/Infrastructure/

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
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/

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,3 @@ jobs:
5050
inputs:
5151
pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
5252
artifactName: helm
53-
- job: BuildWindows
54-
pool:
55-
vmImage: 'vs2017-win2016'
56-
steps:
57-
- task: DockerCompose@0
58-
displayName: Compose build apigws
59-
inputs:
60-
dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
61-
containerregistrytype: Container Registry
62-
dockerRegistryEndpoint: $(registryEndpoint)
63-
dockerComposeFile: docker-compose.yml
64-
qualifyImageNames: true
65-
projectName: ""
66-
dockerComposeFileArgs: |
67-
TAG=$(Build.SourceBranchName)
68-
PLATFORM=win
69-
- task: DockerCompose@0
70-
displayName: Compose push apigws
71-
inputs:
72-
dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
73-
containerregistrytype: Container Registry
74-
dockerRegistryEndpoint: $(registryEndpoint)
75-
dockerComposeFile: docker-compose.yml
76-
qualifyImageNames: true
77-
projectName: ""
78-
dockerComposeFileArgs: |
79-
TAG=$(Build.SourceBranchName)
80-
PLATFORM=win

‎cli-windows/set-dockernat-networkategory-to-private.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#Requires -RunAsAdministrator
2+
Get-NetConnectionProfile | Where-Object { $_.InterfaceAlias -match "(DockerNAT)" } | ForEach-Object { Set-NetConnectionProfile -InterfaceIndex $_.InterfaceIndex -NetworkCategory Private }

‎docker-compose.override.yml‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ services:
110110
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
111111
- OrchestratorType=${ORCHESTRATOR_TYPE}
112112
- UseLoadTest=${USE_LOADTEST:-False}
113+
- Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
113114
ports:
114115
- "5102:80" # Important: In a production environment your should remove the external port (5102) kept here for microservice debugging purposes.
115116
# The API Gateway redirects and access through the internal port (80).
@@ -130,6 +131,7 @@ services:
130131
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
131132
- OrchestratorType=${ORCHESTRATOR_TYPE}
132133
- UseLoadTest=${USE_LOADTEST:-False}
134+
- Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
133135
ports:
134136
- "5111:80"
135137

@@ -168,6 +170,8 @@ services:
168170
- AzureServiceBusEnabled=False
169171
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
170172
- OrchestratorType=${ORCHESTRATOR_TYPE}
173+
- Serilog__MinimumLevel__Override__Payment.API.IntegrationEvents.EventHandling=Verbose
174+
- Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
171175
ports:
172176
- "5108:80" # Important: In a production environment your should remove the external port (5108) kept here for microservice debugging purposes.
173177
# The API Gateway redirects and access through the internal port (80).
@@ -326,40 +330,40 @@ services:
326330
environment:
327331
- ASPNETCORE_ENVIRONMENT=Production
328332
- ASPNETCORE_URLS=http://0.0.0.0:80
329-
- HealthChecks-UI__HealthChecks__1__Name=WebMVC HTTP Check
330-
- HealthChecks-UI__HealthChecks__1__Uri=http://webmvc/hc
331-
- HealthChecks-UI__HealthChecks__2__Name=WebSPA HTTP Check
332-
- HealthChecks-UI__HealthChecks__2__Uri=http://webspa/hc
333-
- HealthChecks-UI__HealthChecks__3__Name=Web Shopping Aggregator GW HTTP Check
334-
- HealthChecks-UI__HealthChecks__3__Uri=http://webshoppingagg/hc
335-
- HealthChecks-UI__HealthChecks__4__Name=Mobile Shopping Aggregator HTTP Check
336-
- HealthChecks-UI__HealthChecks__4__Uri=http://mobileshoppingagg/hc
337-
- HealthChecks-UI__HealthChecks__5__Name=Mobile Shopping API GW HTTP Check
338-
- HealthChecks-UI__HealthChecks__5__Uri=http://mobileshoppingapigw/hc
339-
- HealthChecks-UI__HealthChecks__6__Name=Mobile Marketing API GW HTTP Check
340-
- HealthChecks-UI__HealthChecks__6__Uri=http://mobilemarketingapigw/hc
341-
- HealthChecks-UI__HealthChecks__7__Name=Web Shopping API GW HTTP Check
342-
- HealthChecks-UI__HealthChecks__7__Uri=http://webshoppingapigw/hc
343-
- HealthChecks-UI__HealthChecks__8__Name=Web Marketing API GW HTTP Check
344-
- HealthChecks-UI__HealthChecks__8__Uri=http://webmarketingapigw/hc
345-
- HealthChecks-UI__HealthChecks__9__Name=Ordering HTTP Check
346-
- HealthChecks-UI__HealthChecks__9__Uri=http://ordering.api/hc
347-
- HealthChecks-UI__HealthChecks__10__Name=Ordering HTTP Background Check
348-
- HealthChecks-UI__HealthChecks__10__Uri=http://ordering.backgroundtasks/hc
349-
- HealthChecks-UI__HealthChecks__11__Name=Basket HTTP Check
350-
- HealthChecks-UI__HealthChecks__11__Uri=http://basket.api/hc
351-
- HealthChecks-UI__HealthChecks__12__Name=Catalog HTTP Check
352-
- HealthChecks-UI__HealthChecks__12__Uri=http://catalog.api/hc
353-
- HealthChecks-UI__HealthChecks__13__Name=Identity HTTP Check
354-
- HealthChecks-UI__HealthChecks__13__Uri=http://identity.api/hc
355-
- HealthChecks-UI__HealthChecks__14__Name=Marketing HTTP Check
356-
- HealthChecks-UI__HealthChecks__14__Uri=http://marketing.api/hc
357-
- HealthChecks-UI__HealthChecks__15__Name=Locations HTTP Check
358-
- HealthChecks-UI__HealthChecks__15__Uri=http://locations.api/hc
359-
- HealthChecks-UI__HealthChecks__16__Name=Payments HTTP Check
360-
- HealthChecks-UI__HealthChecks__16__Uri=http://payment.api/hc
361-
- HealthChecks-UI__HealthChecks__17__Name=Ordering SignalRHub HTTP Check
362-
- HealthChecks-UI__HealthChecks__17__Uri=http://ordering.signalrhub/hc
333+
- HealthChecks-UI__HealthChecks__0__Name=WebMVC HTTP Check
334+
- HealthChecks-UI__HealthChecks__0__Uri=http://webmvc/hc
335+
- HealthChecks-UI__HealthChecks__1__Name=WebSPA HTTP Check
336+
- HealthChecks-UI__HealthChecks__1__Uri=http://webspa/hc
337+
- HealthChecks-UI__HealthChecks__2__Name=Web Shopping Aggregator GW HTTP Check
338+
- HealthChecks-UI__HealthChecks__2__Uri=http://webshoppingagg/hc
339+
- HealthChecks-UI__HealthChecks__3__Name=Mobile Shopping Aggregator HTTP Check
340+
- HealthChecks-UI__HealthChecks__3__Uri=http://mobileshoppingagg/hc
341+
- HealthChecks-UI__HealthChecks__4__Name=Mobile Shopping API GW HTTP Check
342+
- HealthChecks-UI__HealthChecks__4__Uri=http://mobileshoppingapigw/hc
343+
- HealthChecks-UI__HealthChecks__5__Name=Mobile Marketing API GW HTTP Check
344+
- HealthChecks-UI__HealthChecks__5__Uri=http://mobilemarketingapigw/hc
345+
- HealthChecks-UI__HealthChecks__6__Name=Web Shopping API GW HTTP Check
346+
- HealthChecks-UI__HealthChecks__6__Uri=http://webshoppingapigw/hc
347+
- HealthChecks-UI__HealthChecks__7__Name=Web Marketing API GW HTTP Check
348+
- HealthChecks-UI__HealthChecks__7__Uri=http://webmarketingapigw/hc
349+
- HealthChecks-UI__HealthChecks__8__Name=Ordering HTTP Check
350+
- HealthChecks-UI__HealthChecks__8__Uri=http://ordering.api/hc
351+
- HealthChecks-UI__HealthChecks__9__Name=Ordering HTTP Background Check
352+
- HealthChecks-UI__HealthChecks__9__Uri=http://ordering.backgroundtasks/hc
353+
- HealthChecks-UI__HealthChecks__10__Name=Basket HTTP Check
354+
- HealthChecks-UI__HealthChecks__10__Uri=http://basket.api/hc
355+
- HealthChecks-UI__HealthChecks__11__Name=Catalog HTTP Check
356+
- HealthChecks-UI__HealthChecks__11__Uri=http://catalog.api/hc
357+
- HealthChecks-UI__HealthChecks__12__Name=Identity HTTP Check
358+
- HealthChecks-UI__HealthChecks__12__Uri=http://identity.api/hc
359+
- HealthChecks-UI__HealthChecks__13__Name=Marketing HTTP Check
360+
- HealthChecks-UI__HealthChecks__13__Uri=http://marketing.api/hc
361+
- HealthChecks-UI__HealthChecks__14__Name=Locations HTTP Check
362+
- HealthChecks-UI__HealthChecks__14__Uri=http://locations.api/hc
363+
- HealthChecks-UI__HealthChecks__15__Name=Payments HTTP Check
364+
- HealthChecks-UI__HealthChecks__15__Uri=http://payment.api/hc
365+
- HealthChecks-UI__HealthChecks__16__Name=Ordering SignalRHub HTTP Check
366+
- HealthChecks-UI__HealthChecks__16__Uri=http://ordering.signalrhub/hc
363367
- OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc
364368
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
365369
- OrchestratorType=${ORCHESTRATOR_TYPE}

‎k8s/helm/deploy-all.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if ([string]::IsNullOrEmpty($dns)) {
4545

4646
if ($clean) {
4747
Write-Host "Cleaning previous helm releases..." -ForegroundColor Green
48-
helm delete --purge $(helm ls -q)
48+
helm delete --purge $(helm ls -q eshop)
4949
Write-Host "Previous releases deleted" -ForegroundColor Green
5050
}
5151

@@ -91,4 +91,4 @@ else {
9191
Write-Host "eShopOnContainers non-infrastructure charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
9292
}
9393

94-
Write-Host "helm charts installed." -ForegroundColor Green
94+
Write-Host "helm charts installed." -ForegroundColor Green

‎restore-packages.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
for /R %%f in (*.csproj) do dotnet restore --no-dependencies %%f

‎run-docker-compose-build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$startTime = $(Get-Date)
22

3-
docker-compose build
3+
docker-compose build --build-arg RUN=scripts/restore-packages
44

55
$elapsedTime = $(Get-Date) - $startTime
66

‎scripts/restore-packages‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
echo RESTORING ALL PACKAGES...; for f in /src/csproj-files/*.csproj; do dotnet restore $f; done

‎scripts/restore-packages.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
for %%p in (csproj-files\*.csproj) do dotnet restore %%p

0 commit comments

Comments
 (0)