Skip to content

Commit 7d2a790

Browse files
committed
Fixed AOT compile issue with signalr pkg version
Removed duplicated ordering.background task in docker compose files
1 parent 36d916a commit 7d2a790

3 files changed

Lines changed: 2 additions & 27 deletions

File tree

docker-compose.override.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -224,24 +224,7 @@ services:
224224
ports:
225225
- "5109:80" # Important: In a production environment your should remove the external port (5109) kept here for microservice debugging purposes.
226226
# The API Gateway redirects and access through the internal port (80).
227-
228-
ordering.backgroundtasks:
229-
environment:
230-
- ASPNETCORE_ENVIRONMENT=Development
231-
- ASPNETCORE_URLS=http://0.0.0.0:80
232-
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
233-
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
234-
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
235-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
236-
- UseCustomizationData=True
237-
- AzureServiceBusEnabled=False
238-
- CheckUpdateTime=30000
239-
- GracePeriodTime=1
240-
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
241-
- OrchestratorType=${ORCHESTRATOR_TYPE}
242-
- UseLoadTest=${USE_LOADTEST:-False}
243-
ports:
244-
- "5111:80"
227+
245228

246229
sql.data:
247230
environment:

docker-compose.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,6 @@ services:
153153
context: .
154154
dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
155155

156-
ordering.backgroundtasks:
157-
image: eshop/ordering.backgroundtasks:${TAG:-latest}
158-
build:
159-
context: .
160-
dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
161-
depends_on:
162-
- sql.data
163-
- rabbitmq
164156
ordering.signalrhub:
165157
image: eshop/ordering.signalrhub:${TAG:-latest}
166158
build:

src/Web/WebSPA/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@angular/platform-browser": "^4.0.0",
3737
"@angular/platform-browser-dynamic": "^4.0.0",
3838
"@angular/router": "^4.0.0",
39-
"@aspnet/signalr": "^1.0.0-preview2-final",
39+
"@aspnet/signalr": "1.0.0-preview2-final",
4040
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
4141
"bootstrap": "4.0.0-alpha.5",
4242
"core-js": "^2.4.1",

0 commit comments

Comments
 (0)