Skip to content

Commit f61d979

Browse files
Fixing Azure Deployment scripts config plus improvements in docker-compose.override,yml
1 parent 96c17ee commit f61d979

8 files changed

Lines changed: 28 additions & 9 deletions
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
3-
"contentVersion": "1.0.0.0",
4-
"parameters": {}
3+
"contentVersion": "1.0.0.0",
4+
"parameters": {
5+
"SitesEshopfunctionsName": {
6+
"value": "eshopfunctionsapp"
7+
}
8+
}
59
}

deploy/az/storage/catalog/deploystorage.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
},
88
"profileName" : {
99
"type": "string"
10+
},
11+
"endpointName" : {
12+
"type": "string"
1013
}
1114
},
1215
"variables": {
1316
"catalogstorage": "[concat(parameters('catalogstorage'), uniqueString(resourceGroup().id))]",
14-
"endpointName": "[concat('endpoint-', uniqueString(resourceGroup().id))]",
17+
"endpointName": "[concat(parameters('endpointName'), uniqueString(resourceGroup().id))]",
1518
"profileName": "[parameters('profileName')]"
1619
},
1720
"resources": [

deploy/az/storage/catalog/deploystorage.parameters.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
},
88
"profileName":{
99
"value": "eshopcatalog"
10+
},
11+
"endpointName":{
12+
"value": "catalog-endpoint"
1013
}
1114
}
1215
}

deploy/az/storage/marketing/deploystorage.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
},
88
"profileName" : {
99
"type": "string"
10+
},
11+
"endpointName" : {
12+
"type": "string"
1013
}
1114
},
1215
"variables": {
1316
"marketingstorage": "[concat(parameters('marketingstorage'), uniqueString(resourceGroup().id))]",
14-
"endpointName": "[concat('endpoint-', uniqueString(resourceGroup().id))]",
17+
"endpointName": "[concat(parameters('endpointName'), uniqueString(resourceGroup().id))]",
1518
"profileName": "[parameters('profileName')]"
1619
},
1720
"resources": [

deploy/az/storage/marketing/deploystorage.parameters.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
},
88
"profileName":{
99
"value": "eshopmarketing"
10+
},
11+
"endpointName":{
12+
"value": "marketing-endpoint"
1013
}
1114
}
1215
}

docker-compose.override.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
- ASPNETCORE_ENVIRONMENT=Development
2626
- ASPNETCORE_URLS=http://0.0.0.0:80
2727
- ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
28-
- PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/catalog/items/[0]/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5110.
28+
- PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5101/api/v1/catalog/items/[0]/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5110.
2929
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
3030
- AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
3131
- AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
@@ -75,7 +75,7 @@ services:
7575
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
7676
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
7777
- CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
78-
- PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
78+
- PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
7979
- AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME}
8080
- AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY}
8181
- AzureServiceBusEnabled=False
@@ -87,7 +87,7 @@ services:
8787
environment:
8888
- ASPNETCORE_ENVIRONMENT=Development
8989
- ASPNETCORE_URLS=http://0.0.0.0:80
90-
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
90+
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
9191
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
9292
- AzureServiceBusEnabled=False
9393

docker-compose.prod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
- ASPNETCORE_ENVIRONMENT=Production
3030
- ASPNETCORE_URLS=http://0.0.0.0:80
3131
- ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
32-
- PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG} #Local: You need to open your local dev-machine firewall at range 5100-5110.
32+
- PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL} #Local: You need to open your local dev-machine firewall at range 5100-5110.
3333
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
3434
- AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
3535
- AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
@@ -76,7 +76,7 @@ services:
7676
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
7777
- IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
7878
- CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
79-
- PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING}
79+
- PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL}
8080
- AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME}
8181
- AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY}
8282
ports:

docker-compose.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ services:
6464
context: ./src/Web/WebSPA
6565
dockerfile: Dockerfile
6666
depends_on:
67+
- catalog.api
68+
- ordering.api
6769
- identity.api
6870
- basket.api
71+
- marketing.api
6972

7073
webmvc:
7174
image: eshop/webmvc:${TAG:-latest}

0 commit comments

Comments
 (0)