Change version of docker-compose from 2 to 2.1 for default values.

I set "http://localhost:5101/api/v1/pic/" because docker-compose doesn't allow to declare another variable such as default value
This commit is contained in:
Christian Arenas 2017-05-30 17:24:46 +02:00
parent 1a385a2179
commit 9866aae07c
4 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
version: '2' version: '2.1'
# The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine. # The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine.
# The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: # The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like:
@ -23,7 +23,7 @@ services:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
- ExternalCatalogBaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - PicBaseUrl=${ESHOP_AZURE_STORAGE_ACCOUNT:-http://localhost:5101/api/v1/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
- EventBusConnection=rabbitmq - EventBusConnection=rabbitmq
ports: ports:
- "5101:80" - "5101:80"

View File

@ -1,4 +1,4 @@
version: '2' version: '2.1'
services: services:
basket.api: basket.api:

View File

@ -1,4 +1,4 @@
version: '2' version: '2.1'
services: services:
basket.api: basket.api:

View File

@ -1,4 +1,4 @@
version: '2' version: '2.1'
services: services:
basket.api: basket.api: