Skip to content

Commit 4ed070d

Browse files
ramon-tomas-cramon-tomas-c
committed
Merge from Dev
2 parents 27fd97b + 606f23e commit 4ed070d

105 files changed

Lines changed: 5482 additions & 94 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.

‎cli-windows/add-firewall-rules-for-sts-auth-thru-docker.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ try {
2121
Write-Host "Rule found"
2222
}
2323
catch [Exception] {
24-
New-NetFirewallRule -DisplayName eShopOnContainers-Inbound -Confirm -Description "eShopOnContainers Inbound Rule for port range 5100-5105" -LocalAddress Any -LocalPort 5100-5105 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound
25-
New-NetFirewallRule -DisplayName eShopOnContainers-Outbound -Confirm -Description "eShopOnContainers Outbound Rule for port range 5100-5105" -LocalAddress Any -LocalPort 5100-5105 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound
24+
New-NetFirewallRule -DisplayName eShopOnContainers-Inbound -Confirm -Description "eShopOnContainers Inbound Rule for port range 5100-5105" -LocalAddress Any -LocalPort 5100-5110 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound
25+
New-NetFirewallRule -DisplayName eShopOnContainers-Outbound -Confirm -Description "eShopOnContainers Outbound Rule for port range 5100-5105" -LocalAddress Any -LocalPort 5100-5110 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound
2626
}

‎docker-compose-windows.override.yml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,19 @@ services:
8080
- SA_PASSWORD=Pass@word
8181
- ACCEPT_EULA=Y
8282
ports:
83-
- "5433:1433"
83+
- "5433:1433"
84+
85+
nosql.data:
86+
ports:
87+
- "27017:27017"
88+
89+
locations.api:
90+
environment:
91+
- ASPNETCORE_ENVIRONMENT=Development
92+
- ASPNETCORE_URLS=http://0.0.0.0:80
93+
- ConnectionString=mongodb://nosql.data
94+
- Database=LocationsDb
95+
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
96+
- EventBusConnection=rabbitmq
97+
ports:
98+
- "5109:80"

‎docker-compose-windows.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,20 @@ services:
5353
- ordering.api
5454
- identity.api
5555
- basket.api
56-
56+
57+
locations.api:
58+
image: locations.api
59+
build:
60+
context: ./src/Services/Location/Locations.API
61+
dockerfile: Dockerfile
62+
depends_on:
63+
- nosql.data
64+
5765
sql.data:
5866
image: microsoft/mssql-server-windows
67+
68+
nosql.data:
69+
image: mongo:windowsservercore
5970

6071
basket.data:
6172
image: redis:nanoserver

‎docker-compose.override.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ services:
4949
ports:
5050
- "5102:80"
5151

52+
marketing.api:
53+
environment:
54+
- ASPNETCORE_ENVIRONMENT=Development
55+
- ASPNETCORE_URLS=http://0.0.0.0:80
56+
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
57+
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
58+
ports:
59+
- "5110:80"
60+
5261
webspa:
5362
environment:
5463
- ASPNETCORE_ENVIRONMENT=Development
@@ -83,6 +92,10 @@ services:
8392
ports:
8493
- "5433:1433"
8594

95+
nosql.data:
96+
ports:
97+
- "27017:27017"
98+
8699
webstatus:
87100
environment:
88101
- ASPNETCORE_ENVIRONMENT=Development
@@ -95,3 +108,14 @@ services:
95108
- spa=http://webspa/hc
96109
ports:
97110
- "5107:80"
111+
112+
locations.api:
113+
environment:
114+
- ASPNETCORE_ENVIRONMENT=Development
115+
- ASPNETCORE_URLS=http://0.0.0.0:80
116+
- ConnectionString=mongodb://nosql.data
117+
- Database=LocationsDb
118+
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
119+
- EventBusConnection=rabbitmq
120+
ports:
121+
- "5109:80"

‎docker-compose.prod.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ services:
5454
ports:
5555
- "5102:80"
5656

57+
marketing.api:
58+
environment:
59+
- ASPNETCORE_ENVIRONMENT=Production
60+
- ASPNETCORE_URLS=http://0.0.0.0:80
61+
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
62+
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
63+
ports:
64+
- "5110:80"
65+
5766
webspa:
5867
environment:
5968
- ASPNETCORE_ENVIRONMENT=Production

‎docker-compose.vs.debug.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,22 @@ services:
6161
labels:
6262
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
6363

64+
marketing.api:
65+
image: eshop/marketing.api:dev
66+
build:
67+
args:
68+
source: ${DOCKER_BUILD_SOURCE}
69+
environment:
70+
- DOTNET_USE_POLLING_FILE_WATCHER=1
71+
volumes:
72+
- ./src/Services/Marketing/Marketing.API:/app
73+
- ~/.nuget/packages:/root/.nuget/packages:ro
74+
- ~/clrdbg:/clrdbg:ro
75+
entrypoint: tail -f /dev/null
76+
labels:
77+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
78+
79+
6480
webspa:
6581
image: eshop/webspa:dev
6682
build:
@@ -105,3 +121,18 @@ services:
105121
entrypoint: tail -f /dev/null
106122
labels:
107123
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
124+
125+
locations.api:
126+
image: eshop/locations.api:dev
127+
build:
128+
args:
129+
source: ${DOCKER_BUILD_SOURCE}
130+
environment:
131+
- DOTNET_USE_POLLING_FILE_WATCHER=1
132+
volumes:
133+
- ./src/Services/Location/Locations.API:/app
134+
- ~/.nuget/packages:/root/.nuget/packages:ro
135+
- ~/clrdbg:/clrdbg:ro
136+
entrypoint: tail -f /dev/null
137+
labels:
138+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"

‎docker-compose.vs.release.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ services:
4141
labels:
4242
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
4343

44+
marketing.api:
45+
build:
46+
args:
47+
source: ${DOCKER_BUILD_SOURCE}
48+
volumes:
49+
- ~/clrdbg:/clrdbg:ro
50+
entrypoint: tail -f /dev/null
51+
labels:
52+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
53+
4454
webspa:
4555
build:
4656
args:
@@ -70,3 +80,13 @@ services:
7080
entrypoint: tail -f /dev/null
7181
labels:
7282
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
83+
84+
locations.api:
85+
build:
86+
args:
87+
source: ${DOCKER_BUILD_SOURCE}
88+
volumes:
89+
- ~/clrdbg:/clrdbg:ro
90+
entrypoint: tail -f /dev/null
91+
labels:
92+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"

‎docker-compose.yml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ services:
3636
depends_on:
3737
- sql.data
3838

39+
marketing.api:
40+
image: eshop/marketing.api
41+
build:
42+
context: ./src/Services/Marketing/Marketing.API
43+
dockerfile: Dockerfile
44+
depends_on:
45+
- sql.data
46+
- identity.api
47+
3948
webspa:
4049
image: eshop/webspa
4150
build:
@@ -59,6 +68,9 @@ services:
5968
sql.data:
6069
image: microsoft/mssql-server-linux
6170

71+
nosql.data:
72+
image: mongo
73+
6274
basket.data:
6375
image: redis
6476
ports:
@@ -74,4 +86,11 @@ services:
7486
build:
7587
context: ./src/Web/WebStatus
7688
dockerfile: Dockerfile
77-
89+
90+
locations.api:
91+
image: locations.api
92+
build:
93+
context: ./src/Services/Location/Locations.API
94+
dockerfile: Dockerfile
95+
depends_on:
96+
- nosql.data

0 commit comments

Comments
 (0)