Skip to content

Commit 17dd9ce

Browse files
author
ericuss
committed
remove all references of basket background
1 parent e1b21ab commit 17dd9ce

27 files changed

Lines changed: 7 additions & 461 deletions

build/acr-build/queue-all.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ $services = @(
1313
@{ Name="eshopcatalog"; Image="eshop/catalog.api"; File="src/Services/Catalog/Catalog.API/Dockerfile" },
1414
@{ Name="eshopidentity"; Image="eshop/identity.api"; File="src/Services/Identity/Identity.API/Dockerfile" },
1515
@{ Name="eshopordering"; Image="eshop/ordering.api"; File="src/Services/Ordering/Ordering.API/Dockerfile" },
16-
@{ Name="eshoporderingbg"; Image="eshop/ordering.backgroundtasks"; File="src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile" },
1716
@{ Name="eshopmarketing"; Image="eshop/marketing.api"; File="src/Services/Marketing/Marketing.API/Dockerfile" },
1817
@{ Name="eshopwebspa"; Image="eshop/webspa"; File="src/Web/WebSPA/Dockerfile" },
1918
@{ Name="eshopwebmvc"; Image="eshop/webmvc"; File="src/Web/WebMVC/Dockerfile" },

build/multiarch-manifests/create-manifests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Write-Host "Tags used are linux-master, win-master, linux-dev, win-dev, linux-la
1212
Write-Host "Multiarch images tags will be master, dev, latest" -ForegroundColor Yellow
1313

1414

15-
$services = "identity.api", "basket.api", "catalog.api", "ordering.api", "ordering.backgroundtasks", "marketing.api", "payment.api", "locations.api", "webhooks.api", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub", "webstatus", "webspa", "webmvc", "webhooks.client"
15+
$services = "identity.api", "basket.api", "catalog.api", "ordering.api", "marketing.api", "payment.api", "locations.api", "webhooks.api", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub", "webstatus", "webspa", "webmvc", "webhooks.client"
1616

1717
foreach ($svc in $services) {
1818
Write-Host "Creating manifest for $svc and tags :latest, :master, and :dev"

docker-compose-windows.prod.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,6 @@ services:
6969
ports:
7070
- "5102:80"
7171

72-
ordering.backgroundtasks:
73-
environment:
74-
- ASPNETCORE_ENVIRONMENT=Production
75-
- ASPNETCORE_URLS=http://0.0.0.0:80
76-
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
77-
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
78-
- UseCustomizationData=True
79-
- AzureServiceBusEnabled=False
80-
ports:
81-
- "5111:80"
82-
8372
webspa:
8473
environment:
8574
- ASPNETCORE_ENVIRONMENT=Production

docker-compose.override.windows.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ services:
3737
- EventBusUserName=admin
3838
- EventBusPassword=password
3939

40-
ordering.backgroundtasks:
41-
environment:
42-
- EventBusUserName=admin
43-
- EventBusPassword=password
44-
4540
payment.api:
4641
environment:
4742
- EventBusUserName=admin

docker-compose.override.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -115,26 +115,6 @@ services:
115115
ports:
116116
- "5102:80"
117117

118-
119-
ordering.backgroundtasks:
120-
environment:
121-
- ASPNETCORE_ENVIRONMENT=Development
122-
- ASPNETCORE_URLS=http://0.0.0.0:80
123-
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
124-
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
125-
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
126-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
127-
- UseCustomizationData=True
128-
- AzureServiceBusEnabled=False
129-
- CheckUpdateTime=30000
130-
- GracePeriodTime=1
131-
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
132-
- OrchestratorType=${ORCHESTRATOR_TYPE}
133-
- UseLoadTest=${USE_LOADTEST:-False}
134-
- Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
135-
ports:
136-
- "5111:80"
137-
138118
marketing.api:
139119
environment:
140120
- ASPNETCORE_ENVIRONMENT=Development
@@ -343,8 +323,6 @@ services:
343323
- HealthChecks-UI__HealthChecks__7__Uri=http://webmarketingapigw/hc
344324
- HealthChecks-UI__HealthChecks__8__Name=Ordering HTTP Check
345325
- HealthChecks-UI__HealthChecks__8__Uri=http://ordering.api/hc
346-
- HealthChecks-UI__HealthChecks__9__Name=Ordering HTTP Background Check
347-
- HealthChecks-UI__HealthChecks__9__Uri=http://ordering.backgroundtasks/hc
348326
- HealthChecks-UI__HealthChecks__10__Name=Basket HTTP Check
349327
- HealthChecks-UI__HealthChecks__10__Uri=http://basket.api/hc
350328
- HealthChecks-UI__HealthChecks__11__Name=Catalog HTTP Check
@@ -359,7 +337,6 @@ services:
359337
- HealthChecks-UI__HealthChecks__15__Uri=http://payment.api/hc
360338
- HealthChecks-UI__HealthChecks__16__Name=Ordering SignalRHub HTTP Check
361339
- HealthChecks-UI__HealthChecks__16__Uri=http://ordering.signalrhub/hc
362-
- OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc
363340
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
364341
- OrchestratorType=${ORCHESTRATOR_TYPE}
365342
ports:

docker-compose.prod.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,25 +91,6 @@ services:
9191
ports:
9292
- "80" # The API Gateway redirects and access through the internal port (80).
9393

94-
95-
ordering.backgroundtasks:
96-
environment:
97-
- ASPNETCORE_ENVIRONMENT=Development
98-
- ASPNETCORE_URLS=http://0.0.0.0:80
99-
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
100-
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
101-
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
102-
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
103-
- UseCustomizationData=True
104-
- AzureServiceBusEnabled=False
105-
- CheckUpdateTime=30000
106-
- GracePeriodTime=1
107-
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
108-
- OrchestratorType=${ORCHESTRATOR_TYPE}
109-
- UseLoadTest=${USE_LOADTEST:-False}
110-
ports:
111-
- "5111:80"
112-
11394
marketing.api:
11495
environment:
11596
- ASPNETCORE_ENVIRONMENT=Development
@@ -179,7 +160,6 @@ services:
179160
- ASPNETCORE_URLS=http://0.0.0.0:80
180161
- CatalogUrl=http://catalog.api/hc
181162
- OrderingUrl=http://ordering.api/hc
182-
- OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc
183163
- BasketUrl=http://basket.api/hc
184164
- IdentityUrl=http://identity.api/hc
185165
- LocationsUrl=http://locations.api/hc

docker-compose.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,7 @@ services:
5252
depends_on:
5353
- sql.data
5454
- rabbitmq
55-
56-
ordering.backgroundtasks:
57-
image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
58-
build:
59-
context: .
60-
dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
61-
depends_on:
62-
- sql.data
63-
- rabbitmq
55+
- identity.api
6456

6557
marketing.api:
6658
image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest}

eShopOnContainers.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunne
9999
EndProject
100100
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunner.Windows", "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.Windows\eShopOnContainers.TestRunner.Windows.csproj", "{A7337243-33B8-463A-87AD-944B75EFD820}"
101101
EndProject
102-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks", "src\Services\Ordering\Ordering.BackgroundTasks\Ordering.BackgroundTasks.csproj", "{16CDE5D2-2DDE-4AF2-B902-AD9CC42DE480}"
103-
EndProject
104102
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basket.FunctionalTests", "src\Services\Basket\Basket.FunctionalTests\Basket.FunctionalTests.csproj", "{9F00E62F-E180-4A9C-8794-98A72AFAC2DB}"
105103
EndProject
106104
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basket.UnitTests", "src\Services\Basket\Basket.UnitTests\Basket.UnitTests.csproj", "{63417272-1E6A-406A-AD11-C738558D89C0}"

k8s/build-push-images.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if (-not [string]::IsNullOrEmpty($dockerUser)) {
5757
# Push images to Docker registry
5858
if ($pushImages) {
5959
Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow
60-
$services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "ordering.backgroundtasks", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub")
60+
$services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub")
6161

6262
foreach ($service in $services) {
6363
$imageFqdn = if ($useDockerHub) {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"}

k8s/deploy.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if ($buildImages) {
6868

6969
if ($pushImages) {
7070
Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow
71-
$services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "ordering.backgroundtasks", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub")
71+
$services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub")
7272

7373
foreach ($service in $services) {
7474
$imageFqdn = if ($useDockerHub) {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"}

0 commit comments

Comments
 (0)