Skip to content

Commit 556c07b

Browse files
mvelosopmvelosop
committed
MVC working with SignalR without Envoy
1 parent a032959 commit 556c07b

2 files changed

Lines changed: 53 additions & 53 deletions

File tree

‎src/Services/Ordering/Ordering.SignalrHub/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
151151
{
152152
Predicate = r => r.Name.Contains("self")
153153
});
154-
endpoints.MapHub<NotificationsHub>("/notificationhub", options => options.Transports = Microsoft.AspNetCore.Http.Connections.HttpTransports.All);
154+
endpoints.MapHub<NotificationsHub>("/hub/notificationhub", options => options.Transports = Microsoft.AspNetCore.Http.Connections.HttpTransports.All);
155155
});
156156

157157
ConfigureEventBus(app);

‎src/docker-compose.override.yml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.4'
22

3-
# The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine.
4-
# The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like:
3+
# The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine.
4+
# The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like:
55
# ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost
66
# but values present in the environment vars at runtime will always override those defined inside the .env file
77
# An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance.
@@ -18,34 +18,34 @@ services:
1818
- SA_PASSWORD=Pass@word
1919
- ACCEPT_EULA=Y
2020
ports:
21-
- "5433:1433"
21+
- "5433:1433"
2222
volumes:
2323
- eshop-sqldata:/var/opt/mssql
2424

2525
nosqldata:
2626
ports:
27-
- "27017:27017"
27+
- "27017:27017"
2828
volumes:
2929
- eshop-nosqldata:/data/db
3030

3131
basketdata:
3232
ports:
33-
- "6379:6379"
33+
- "6379:6379"
3434
volumes:
3535
- eshop-basketdata:/data
3636
rabbitmq:
3737
ports:
38-
- "15672:15672"
39-
- "5672:5672"
38+
- "15672:15672"
39+
- "5672:5672"
4040

4141
identity-api:
4242
environment:
4343
- ASPNETCORE_ENVIRONMENT=Development
4444
- ASPNETCORE_URLS=http://0.0.0.0:80
4545
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
46-
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
47-
- ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
48-
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100
46+
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
47+
- ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
48+
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100
4949
- LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
5050
- MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
5151
- BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
@@ -54,22 +54,22 @@ services:
5454
- WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
5555
- WebhooksApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5113
5656
- WebhooksWebClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5114
57-
- UseCustomizationData=True
57+
- UseCustomizationData=True
5858
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
5959
- OrchestratorType=${ORCHESTRATOR_TYPE}
6060
ports:
61-
- "5105:80"
61+
- "5105:80"
6262

6363
basket-api:
6464
environment:
6565
- ASPNETCORE_ENVIRONMENT=Development
6666
- ASPNETCORE_URLS=http://0.0.0.0:80
6767
- ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basketdata}
68-
- identityUrl=http://identity-api
68+
- identityUrl=http://identity-api
6969
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
7070
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
7171
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
72-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
72+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
7373
- AzureServiceBusEnabled=False
7474
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
7575
- OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -78,17 +78,17 @@ services:
7878
- GRPC_PORT=81
7979
- PORT=80
8080
ports:
81-
- "5103:80"
82-
- "9103:81"
81+
- "5103:80"
82+
- "9103:81"
8383

8484
catalog-api:
8585
environment:
8686
- ASPNETCORE_ENVIRONMENT=Development
8787
- ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
88-
- PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5202/c/api/v1/catalog/items/[0]/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5110.
88+
- PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5202/c/api/v1/catalog/items/[0]/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5110.
8989
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
9090
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
91-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
91+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
9292
- AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
9393
- AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
9494
- UseCustomizationData=True
@@ -108,11 +108,11 @@ services:
108108
- ASPNETCORE_ENVIRONMENT=Development
109109
- ASPNETCORE_URLS=http://0.0.0.0:80
110110
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
111-
- identityUrl=http://identity-api
111+
- identityUrl=http://identity-api
112112
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
113113
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
114114
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
115-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
115+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
116116
- UseCustomizationData=True
117117
- AzureServiceBusEnabled=False
118118
- CheckUpdateTime=30000
@@ -125,17 +125,17 @@ services:
125125
- GRPC_PORT=81
126126
- PORT=80
127127
ports:
128-
- "5102:80"
129-
- "9102:81"
130-
128+
- "5102:80"
129+
- "9102:81"
130+
131131
ordering-backgroundtasks:
132132
environment:
133133
- ASPNETCORE_ENVIRONMENT=Development
134134
- ASPNETCORE_URLS=http://0.0.0.0:80
135135
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
136136
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
137137
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
138-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
138+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
139139
- UseCustomizationData=True
140140
- AzureServiceBusEnabled=False
141141
- CheckUpdateTime=30000
@@ -156,8 +156,8 @@ services:
156156
- MongoDatabase=MarketingDb
157157
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
158158
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
159-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
160-
- identityUrl=http://identity-api
159+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
160+
- identityUrl=http://identity-api
161161
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
162162
- CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
163163
- PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
@@ -170,22 +170,22 @@ services:
170170
- UseLoadTest=${USE_LOADTEST:-False}
171171
- PATH_BASE=/marketing-api
172172
ports:
173-
- "5110:80"
173+
- "5110:80"
174174

175175
payment-api:
176176
environment:
177177
- ASPNETCORE_ENVIRONMENT=Development
178178
- ASPNETCORE_URLS=http://0.0.0.0:80
179179
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
180180
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
181-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
181+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
182182
- AzureServiceBusEnabled=False
183183
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
184184
- OrchestratorType=${ORCHESTRATOR_TYPE}
185185
- Serilog__MinimumLevel__Override__payment-api.IntegrationEvents.EventHandling=Verbose
186186
- Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
187187
ports:
188-
- "5108:80"
188+
- "5108:80"
189189

190190
locations-api:
191191
environment:
@@ -197,14 +197,14 @@ services:
197197
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
198198
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
199199
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
200-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
200+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
201201
- AzureServiceBusEnabled=False
202202
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
203203
- OrchestratorType=${ORCHESTRATOR_TYPE}
204204
- UseLoadTest=${USE_LOADTEST:-False}
205205
- PATH_BASE=/locations-api
206206
ports:
207-
- "5109:80"
207+
- "5109:80"
208208

209209
webhooks-api:
210210
environment:
@@ -213,36 +213,36 @@ services:
213213
- ConnectionString=${ESHOP_AZURE_WEBHOOKS_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=sa;Password=Pass@word}
214214
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
215215
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
216-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
217-
- IdentityUrl=http://identity-api
216+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
217+
- IdentityUrl=http://identity-api
218218
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
219219
ports:
220-
- "5113:80"
220+
- "5113:80"
221221

222222
mobileshoppingapigw:
223223
volumes:
224-
- ./ApiGateways/Envoy/config/mobilemarketing:/etc/envoy
224+
- ./ApiGateways/Envoy/config/mobilemarketing:/etc/envoy
225225
ports:
226226
- "5200:80"
227227
- "15200:8001"
228228

229229
mobilemarketingapigw:
230230
volumes:
231-
- ./ApiGateways/Envoy/config/mobileshopping:/etc/envoy
231+
- ./ApiGateways/Envoy/config/mobileshopping:/etc/envoy
232232
ports:
233233
- "5201:80"
234-
- "15201:8001"
234+
- "15201:8001"
235235

236236
webshoppingapigw:
237237
volumes:
238-
- ./ApiGateways/Envoy/config/webshopping:/etc/envoy
238+
- ./ApiGateways/Envoy/config/webshopping:/etc/envoy
239239
ports:
240240
- "5202:80"
241241
- "15202:8001"
242242

243243
webmarketingapigw:
244244
volumes:
245-
- ./ApiGateways/Envoy/config/webmarketing:/etc/envoy
245+
- ./ApiGateways/Envoy/config/webmarketing:/etc/envoy
246246
ports:
247247
- "5203:80"
248248
- "15203:8001"
@@ -259,7 +259,7 @@ services:
259259
- urls__grpcOrdering=http://ordering-api:81
260260
- CatalogUrlHC=http://catalog-api/hc
261261
- OrderingUrlHC=http://ordering-api/hc
262-
- IdentityUrlHC=http://identity-api/hc
262+
- IdentityUrlHC=http://identity-api/hc
263263
- BasketUrlHC=http://basket-api/hc
264264
- MarketingUrlHC=http://marketing-api/hc
265265
- PaymentUrlHC=http://payment-api/hc
@@ -280,26 +280,26 @@ services:
280280
- urls__grpcOrdering=http://ordering-api:81
281281
- CatalogUrlHC=http://catalog-api/hc
282282
- OrderingUrlHC=http://ordering-api/hc
283-
- IdentityUrlHC=http://identity-api/hc
283+
- IdentityUrlHC=http://identity-api/hc
284284
- BasketUrlHC=http://basket-api/hc
285285
- MarketingUrlHC=http://marketing-api/hc
286286
- PaymentUrlHC=http://payment-api/hc
287287
- LocationUrlHC=http://locations-api/hc
288288
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
289289
ports:
290-
- "5121:80"
290+
- "5121:80"
291291

292292
ordering-signalrhub:
293293
environment:
294294
- ASPNETCORE_ENVIRONMENT=Development
295295
- ASPNETCORE_URLS=http://0.0.0.0:80
296296
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
297297
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
298-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
298+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
299299
- AzureServiceBusEnabled=False
300300
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
301301
- OrchestratorType=${ORCHESTRATOR_TYPE}
302-
- identityUrl=http://identity-api
302+
- identityUrl=http://identity-api
303303
ports:
304304
- "5112:80"
305305

@@ -330,9 +330,9 @@ services:
330330
- HealthChecksUI__HealthChecks__10__Name=Payments HTTP Check
331331
- HealthChecksUI__HealthChecks__10__Uri=http://payment-api/hc
332332
- HealthChecksUI__HealthChecks__11__Name=Ordering SignalRHub HTTP Check
333-
- HealthChecksUI__HealthChecks__11__Uri=http://ordering-signalrhub/hc
333+
- HealthChecksUI__HealthChecks__11__Uri=http://ordering-signalrhub/hc
334334
- HealthChecksUI__HealthChecks__12__Name=Ordering HTTP Background Check
335-
- HealthChecksUI__HealthChecks__12__Uri=http://ordering-backgroundtasks/hc
335+
- HealthChecksUI__HealthChecks__12__Uri=http://ordering-backgroundtasks/hc
336336
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
337337
- OrchestratorType=${ORCHESTRATOR_TYPE}
338338
ports:
@@ -343,13 +343,13 @@ services:
343343
- ASPNETCORE_ENVIRONMENT=Development
344344
- ASPNETCORE_URLS=http://0.0.0.0:80
345345
- IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
346-
- PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
347-
- MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5203
346+
- PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
347+
- MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5203
348348
- IdentityUrlHC=http://identity-api/hc
349349
- UseCustomizationData=True
350350
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
351351
- OrchestratorType=${ORCHESTRATOR_TYPE}
352-
- SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
352+
- SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5112
353353
ports:
354354
- "5104:80"
355355

@@ -358,9 +358,9 @@ services:
358358
- ASPNETCORE_ENVIRONMENT=Development
359359
- ASPNETCORE_URLS=http://0.0.0.0:80
360360
- PurchaseUrl=http://webshoppingapigw
361-
- IdentityUrl=http://10.0.75.1:5105
362-
- MarketingUrl=http://webmarketingapigw
363-
- SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
361+
- IdentityUrl=http://10.0.75.1:5105
362+
- MarketingUrl=http://webmarketingapigw
363+
- SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5112
364364
- IdentityUrlHC=http://identity-api/hc
365365
- UseCustomizationData=True
366366
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}

0 commit comments

Comments
 (0)