Skip to content

Commit bcc79c8

Browse files
eiximeniseiximenis
committed
Merge branch 'features/net21rc1' of https://github.com/dotnet-architecture/eShopOnContainers into features/net21rc1
2 parents 89fb5d6 + 88fa0a6 commit bcc79c8

13 files changed

Lines changed: 123 additions & 546 deletions

File tree

‎docker-compose.yml‎

Lines changed: 109 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
version: '3.4'
22

33
services:
4+
sql.data:
5+
image: microsoft/mssql-server-linux:2017-latest
6+
7+
nosql.data:
8+
image: mongo
9+
10+
basket.data:
11+
image: redis:alpine
12+
13+
rabbitmq:
14+
image: rabbitmq:3-management-alpine
15+
16+
identity.api:
17+
image: eshop/identity.api:${TAG:-latest}
18+
build:
19+
context: .
20+
dockerfile: src/Services/Identity/Identity.API/Dockerfile
21+
depends_on:
22+
- sql.data
423

524
basket.api:
625
image: eshop/basket.api:${TAG:-latest}
@@ -21,14 +40,6 @@ services:
2140
- sql.data
2241
- rabbitmq
2342

24-
identity.api:
25-
image: eshop/identity.api:${TAG:-latest}
26-
build:
27-
context: .
28-
dockerfile: src/Services/Identity/Identity.API/Dockerfile
29-
depends_on:
30-
- sql.data
31-
3243
ordering.api:
3344
image: eshop/ordering.api:${TAG:-latest}
3445
build:
@@ -58,36 +69,6 @@ services:
5869
- identity.api
5970
- rabbitmq
6071

61-
webspa:
62-
image: eshop/webspa:${TAG:-latest}
63-
build:
64-
context: .
65-
dockerfile: src/Web/WebSPA/Dockerfile
66-
depends_on:
67-
- catalog.api
68-
- ordering.api
69-
- identity.api
70-
- basket.api
71-
- marketing.api
72-
73-
webmvc:
74-
image: eshop/webmvc:${TAG:-latest}
75-
build:
76-
context: .
77-
dockerfile: src/Web/WebMVC/Dockerfile
78-
depends_on:
79-
- catalog.api
80-
- ordering.api
81-
- identity.api
82-
- basket.api
83-
- marketing.api
84-
85-
webstatus:
86-
image: eshop/webstatus:${TAG:-latest}
87-
build:
88-
context: .
89-
dockerfile: src/Web/WebStatus/Dockerfile
90-
9172
payment.api:
9273
image: eshop/payment.api:${TAG:-latest}
9374
build:
@@ -105,57 +86,135 @@ services:
10586
- nosql.data
10687
- rabbitmq
10788

108-
sql.data:
109-
image: microsoft/mssql-server-linux:2017-latest
110-
111-
nosql.data:
112-
image: mongo
113-
114-
basket.data:
115-
image: redis:alpine
116-
117-
rabbitmq:
118-
image: rabbitmq:3-management-alpine
119-
12089
mobileshoppingapigw:
12190
image: eshop/ocelotapigw:${TAG:-latest}
12291
build:
12392
context: .
12493
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
94+
depends_on:
95+
- nosql.data
96+
- sql.data
97+
- identity.api
98+
- rabbitmq
99+
- ordering.api
100+
- marketing.api
101+
- catalog.api
102+
- basket.api
125103

126104
mobilemarketingapigw:
127105
image: eshop/ocelotapigw:${TAG:-latest}
128106
build:
129107
context: .
130108
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
109+
depends_on:
110+
- nosql.data
111+
- sql.data
112+
- identity.api
113+
- rabbitmq
114+
- ordering.api
115+
- marketing.api
116+
- catalog.api
117+
- basket.api
131118

132119
webshoppingapigw:
133120
image: eshop/ocelotapigw:${TAG:-latest}
134121
build:
135122
context: .
136123
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
124+
depends_on:
125+
- nosql.data
126+
- sql.data
127+
- identity.api
128+
- rabbitmq
129+
- ordering.api
130+
- marketing.api
131+
- catalog.api
132+
- basket.api
137133

138134
webmarketingapigw:
139135
image: eshop/ocelotapigw:${TAG:-latest}
140136
build:
141137
context: .
142138
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
139+
depends_on:
140+
- nosql.data
141+
- sql.data
142+
- identity.api
143+
- rabbitmq
144+
- ordering.api
145+
- marketing.api
146+
- catalog.api
147+
- basket.api
143148

144149
mobileshoppingagg:
145150
image: eshop/mobileshoppingagg:${TAG:-latest}
146151
build:
147152
context: .
148153
dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
154+
depends_on:
155+
- nosql.data
156+
- sql.data
157+
- identity.api
158+
- rabbitmq
159+
- ordering.api
160+
- marketing.api
161+
- catalog.api
162+
- basket.api
149163

150164
webshoppingagg:
151165
image: eshop/webshoppingagg:${TAG:-latest}
152166
build:
153167
context: .
154168
dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
169+
depends_on:
170+
- nosql.data
171+
- sql.data
172+
- identity.api
173+
- rabbitmq
174+
- ordering.api
175+
- marketing.api
176+
- catalog.api
177+
- basket.api
155178

156179
ordering.signalrhub:
157180
image: eshop/ordering.signalrhub:${TAG:-latest}
158181
build:
159182
context: .
160183
dockerfile: src/Services/Ordering/Ordering.SignalrHub/Dockerfile
184+
depends_on:
185+
- nosql.data
186+
- sql.data
187+
- identity.api
188+
- rabbitmq
189+
- ordering.api
190+
- marketing.api
191+
- catalog.api
192+
- basket.api
193+
194+
webstatus:
195+
image: eshop/webstatus:${TAG:-latest}
196+
build:
197+
context: .
198+
dockerfile: src/Web/WebStatus/Dockerfile
199+
200+
webspa:
201+
image: eshop/webspa:${TAG:-latest}
202+
build:
203+
context: .
204+
dockerfile: src/Web/WebSPA/Dockerfile
205+
depends_on:
206+
- webshoppingagg
207+
- webshoppingapigw
208+
- webmarketingapigw
209+
210+
211+
webmvc:
212+
image: eshop/webmvc:${TAG:-latest}
213+
build:
214+
context: .
215+
dockerfile: src/Web/WebMVC/Dockerfile
216+
depends_on:
217+
- webshoppingagg
218+
- webshoppingapigw
219+
- webmarketingapigw
161220

‎eShopOnContainers-ServicesAndWebApps.sln‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks",
128128
EndProject
129129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.SignalrHub", "src\Services\Ordering\Ordering.SignalrHub\Ordering.SignalrHub.csproj", "{E1D2B260-4E7F-4A88-BC13-9910F7C44623}"
130130
EndProject
131-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ordering.BackgroundTasksHost", "src\Services\Ordering\Ordering.BackgroundTasksHost\Ordering.BackgroundTasksHost.csproj", "{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}"
132-
EndProject
133131
Global
134132
GlobalSection(SolutionConfigurationPlatforms) = preSolution
135133
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1536,54 +1534,6 @@ Global
15361534
{E1D2B260-4E7F-4A88-BC13-9910F7C44623}.Release|x64.Build.0 = Release|Any CPU
15371535
{E1D2B260-4E7F-4A88-BC13-9910F7C44623}.Release|x86.ActiveCfg = Release|Any CPU
15381536
{E1D2B260-4E7F-4A88-BC13-9910F7C44623}.Release|x86.Build.0 = Release|Any CPU
1539-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
1540-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
1541-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
1542-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
1543-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
1544-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
1545-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1546-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
1547-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
1548-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
1549-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
1550-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
1551-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
1552-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
1553-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|ARM.ActiveCfg = Debug|Any CPU
1554-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|ARM.Build.0 = Debug|Any CPU
1555-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
1556-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|iPhone.Build.0 = Debug|Any CPU
1557-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1558-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
1559-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|x64.ActiveCfg = Debug|Any CPU
1560-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|x64.Build.0 = Debug|Any CPU
1561-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|x86.ActiveCfg = Debug|Any CPU
1562-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.AppStore|x86.Build.0 = Debug|Any CPU
1563-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1564-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|Any CPU.Build.0 = Debug|Any CPU
1565-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|ARM.ActiveCfg = Debug|Any CPU
1566-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|ARM.Build.0 = Debug|Any CPU
1567-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
1568-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|iPhone.Build.0 = Debug|Any CPU
1569-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1570-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
1571-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|x64.ActiveCfg = Debug|Any CPU
1572-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|x64.Build.0 = Debug|Any CPU
1573-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|x86.ActiveCfg = Debug|Any CPU
1574-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Debug|x86.Build.0 = Debug|Any CPU
1575-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|Any CPU.ActiveCfg = Release|Any CPU
1576-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|Any CPU.Build.0 = Release|Any CPU
1577-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|ARM.ActiveCfg = Release|Any CPU
1578-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|ARM.Build.0 = Release|Any CPU
1579-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|iPhone.ActiveCfg = Release|Any CPU
1580-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|iPhone.Build.0 = Release|Any CPU
1581-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
1582-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
1583-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|x64.ActiveCfg = Release|Any CPU
1584-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|x64.Build.0 = Release|Any CPU
1585-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|x86.ActiveCfg = Release|Any CPU
1586-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E}.Release|x86.Build.0 = Release|Any CPU
15871537
EndGlobalSection
15881538
GlobalSection(SolutionProperties) = preSolution
15891539
HideSolutionNode = FALSE
@@ -1639,7 +1589,6 @@ Global
16391589
{AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1} = {28C0F5C8-4849-4035-80AB-45639424E73F}
16401590
{7D63ED4A-3EDA-4BBA-8BBA-F46BD6430931} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
16411591
{E1D2B260-4E7F-4A88-BC13-9910F7C44623} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
1642-
{CA566CD5-A49A-47F7-BDC9-592E36DAF74E} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
16431592
EndGlobalSection
16441593
GlobalSection(ExtensibilityGlobals) = postSolution
16451594
SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}

‎src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
using Microsoft.Extensions.Logging;
1212
using Polly;
1313
using Polly.Extensions.Http;
14+
using Polly.Timeout;
1415
using Swashbuckle.AspNetCore.Swagger;
1516
using System;
1617
using System.Collections.Generic;
1718
using System.IdentityModel.Tokens.Jwt;
19+
using System.Net.Http;
1820

1921
namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
2022
{
@@ -148,9 +150,12 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection
148150
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
149151

150152
//register http services
153+
151154
var retriesWithExponentialBackoff = HttpPolicyExtensions
152-
.HandleTransientHttpError()
153-
.WaitAndRetryAsync(7, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
155+
.HandleTransientHttpError()
156+
.Or<TimeoutRejectedException>()
157+
.OrResult(message => message.StatusCode == System.Net.HttpStatusCode.NotFound)
158+
.WaitAndRetryAsync(7, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
154159

155160
var circuitBreaker = HttpPolicyExtensions
156161
.HandleTransientHttpError()

‎src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public static IWebHost MigrateDbContext<TContext>(this IWebHost webHost, Action<
2727
var retry = Policy.Handle<SqlException>()
2828
.WaitAndRetry(new TimeSpan[]
2929
{
30+
TimeSpan.FromSeconds(3),
3031
TimeSpan.FromSeconds(5),
31-
TimeSpan.FromSeconds(10),
32-
TimeSpan.FromSeconds(15),
32+
TimeSpan.FromSeconds(8),
3333
});
3434

3535
retry.Execute(() =>

‎src/Services/Ordering/Ordering.BackgroundTasksHost/Configuration/BackgroundTaskSettings.cs‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/Services/Ordering/Ordering.BackgroundTasksHost/IntegrationEvents/GracePeriodConfirmedIntegrationEvent.cs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)