Skip to content

Commit 95ad3e1

Browse files
Fixed bug in docker-compose.prod.yml so it used the ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP env-var from .env file
1 parent 48af69c commit 95ad3e1

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# The IP below should be swapped to your real IP or DNS name, like 192.168.88.248, etc. if testing from remote browsers or mobile devices
66

77
ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost
8-
ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.92
8+
ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.162
99

1010
#ESHOP_AZURE_REDIS_BASKET_DB=<YourAzureRedisBasketInfo>
1111
#ESHOP_AZURE_STORAGE_CATALOG_URL=<YourAzureStorage_Catalog_BLOB_URL>

docker-compose.prod.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version: '3'
88
#
99
# IMPORTANT: Note that this compose file uses ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP instead of ESHOP_EXTERNAL_DNS_NAME_OR_IP
1010

11-
# Set ASPNETCORE_ENVIRONMENT=Development, instead Production, if you want to show up errors while testing.
11+
# Set ASPNETCORE_ENVIRONMENT= Development or Production, depending if you want to show up errors while testing.
1212
#
1313
# You need to start it with the following CLI command:
1414
# docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
@@ -17,7 +17,7 @@ services:
1717

1818
basket.api:
1919
environment:
20-
- ASPNETCORE_ENVIRONMENT=Production
20+
- ASPNETCORE_ENVIRONMENT=Development
2121
- ASPNETCORE_URLS=http://0.0.0.0:80
2222
- ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket.data}
2323
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
@@ -35,7 +35,7 @@ services:
3535

3636
catalog.api:
3737
environment:
38-
- ASPNETCORE_ENVIRONMENT=Production
38+
- ASPNETCORE_ENVIRONMENT=Development
3939
- ASPNETCORE_URLS=http://0.0.0.0:80
4040
- ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
4141
- 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.
@@ -54,7 +54,7 @@ services:
5454

5555
identity.api:
5656
environment:
57-
- ASPNETCORE_ENVIRONMENT=Production
57+
- ASPNETCORE_ENVIRONMENT=Development
5858
- ASPNETCORE_URLS=http://0.0.0.0:80
5959
- SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
6060
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback #localhost do not work for UWP login, so we have to use "external" IP always
@@ -72,7 +72,7 @@ services:
7272

7373
ordering.api:
7474
environment:
75-
- ASPNETCORE_ENVIRONMENT=Production
75+
- ASPNETCORE_ENVIRONMENT=Development
7676
- ASPNETCORE_URLS=http://0.0.0.0:80
7777
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
7878
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
@@ -92,7 +92,7 @@ services:
9292

9393
marketing.api:
9494
environment:
95-
- ASPNETCORE_ENVIRONMENT=Production
95+
- ASPNETCORE_ENVIRONMENT=Development
9696
- ASPNETCORE_URLS=http://0.0.0.0:80
9797
- ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
9898
- MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
@@ -116,7 +116,7 @@ services:
116116

117117
webspa:
118118
environment:
119-
- ASPNETCORE_ENVIRONMENT=Production
119+
- ASPNETCORE_ENVIRONMENT=Development
120120
- ASPNETCORE_URLS=http://0.0.0.0:80
121121
- CatalogUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101
122122
- OrderingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
@@ -138,17 +138,17 @@ services:
138138

139139
webmvc:
140140
environment:
141-
- ASPNETCORE_ENVIRONMENT=Production
141+
- ASPNETCORE_ENVIRONMENT=Development
142142
- ASPNETCORE_URLS=http://0.0.0.0:80
143143
- CatalogUrl=http://catalog.api
144144
- OrderingUrl=http://ordering.api
145145
- BasketUrl=http://basket.api
146146
- LocationsUrl=http://locations.api
147-
- IdentityUrl=http://10.0.75.1:5105
148-
- MarketingUrl=http://marketing.api #Local: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. #Remote: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
147+
- IdentityUrl=http://ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP:5105 #Local: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. #Remote: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
148+
- MarketingUrl=http://marketing.api
149149
- CatalogUrlHC=http://catalog.api/hc
150150
- OrderingUrlHC=http://ordering.api/hc
151-
- IdentityUrlHC=http://identity.api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
151+
- IdentityUrlHC=http://ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
152152
- BasketUrlHC=http://basket.api/hc
153153
- MarketingUrlHC=http://marketing.api/hc
154154
- PaymentUrlHC=http://payment.api/hc
@@ -161,7 +161,7 @@ services:
161161

162162
webstatus:
163163
environment:
164-
- ASPNETCORE_ENVIRONMENT=Production
164+
- ASPNETCORE_ENVIRONMENT=Development
165165
- ASPNETCORE_URLS=http://0.0.0.0:80
166166
- CatalogUrl=http://catalog.api/hc
167167
- OrderingUrl=http://ordering.api/hc
@@ -179,7 +179,7 @@ services:
179179

180180
payment.api:
181181
environment:
182-
- ASPNETCORE_ENVIRONMENT=Production
182+
- ASPNETCORE_ENVIRONMENT=Development
183183
- ASPNETCORE_URLS=http://0.0.0.0:80
184184
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
185185
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -192,7 +192,7 @@ services:
192192

193193
locations.api:
194194
environment:
195-
- ASPNETCORE_ENVIRONMENT=Production
195+
- ASPNETCORE_ENVIRONMENT=Development
196196
- ASPNETCORE_URLS=http://0.0.0.0:80
197197
- ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
198198
- Database=LocationsDb

0 commit comments

Comments
 (0)