Skip to content

Commit 8c11090

Browse files
eiximeniseiximenis
committed
URLs on 80 - WIP
1 parent 9cff047 commit 8c11090

3 files changed

Lines changed: 73 additions & 72 deletions

File tree

‎docker-compose-windows.override.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ services:
1313
- ASPNETCORE_ENVIRONMENT=Development
1414
- ASPNETCORE_URLS=http://0.0.0.0:5103
1515
- ConnectionString=basket.data
16-
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
16+
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
1717
- EventBusConnection=rabbitmq
1818
ports:
1919
- "5103:5103"
2020

2121
catalog.api:
2222
environment:
2323
- ASPNETCORE_ENVIRONMENT=Development
24-
- ASPNETCORE_URLS=http://0.0.0.0:5101
24+
- ASPNETCORE_URLS=http://0.0.0.0:80
2525
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
2626
- 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.
2727
- EventBusConnection=rabbitmq
@@ -31,45 +31,45 @@ services:
3131
identity.api:
3232
environment:
3333
- ASPNETCORE_ENVIRONMENT=Development
34-
- ASPNETCORE_URLS=http://0.0.0.0:5105
34+
- ASPNETCORE_URLS=http://0.0.0.0:80
3535
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
3636
- ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
3737
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5105.
3838
ports:
39-
- "5105:5105"
39+
- "5105:80"
4040

4141
ordering.api:
4242
environment:
4343
- ASPNETCORE_ENVIRONMENT=Development
44-
- ASPNETCORE_URLS=http://0.0.0.0:5102
44+
- ASPNETCORE_URLS=http://0.0.0.0:80
4545
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
46-
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
46+
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
4747
- EventBusConnection=rabbitmq
4848
ports:
49-
- "5102:5102"
49+
- "5102:80"
5050

5151
webspa:
5252
environment:
5353
- ASPNETCORE_ENVIRONMENT=Development
54-
- ASPNETCORE_URLS=http://0.0.0.0:5104
54+
- ASPNETCORE_URLS=http://0.0.0.0:80
5555
- CatalogUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101
5656
- OrderingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
5757
- IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
5858
- BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
5959
ports:
60-
- "5104:5104"
60+
- "5104:80"
6161

6262
webmvc:
6363
environment:
6464
- ASPNETCORE_ENVIRONMENT=Development
65-
- ASPNETCORE_URLS=http://0.0.0.0:5100
66-
- CatalogUrl=http://catalog.api:5101
67-
- OrderingUrl=http://ordering.api:5102
68-
- BasketUrl=http://basket.api:5103
65+
- ASPNETCORE_URLS=http://0.0.0.0:80
66+
- CatalogUrl=http://catalog.api
67+
- OrderingUrl=http://ordering.api
68+
- BasketUrl=http://basket.api
6969
- IdentityUrl=http://10.0.75.1:5105 #Local: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser.
7070
#Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
7171
ports:
72-
- "5100:5100"
72+
- "5100:80"
7373

7474
sql.data:
7575
environment:

‎docker-compose.override.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,70 +11,70 @@ services:
1111
basket.api:
1212
environment:
1313
- ASPNETCORE_ENVIRONMENT=Development
14-
- ASPNETCORE_URLS=http://0.0.0.0:5103
14+
- ASPNETCORE_URLS=http://0.0.0.0:80
1515
- ConnectionString=basket.data
16-
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
16+
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
1717
- EventBusConnection=rabbitmq
1818
ports:
19-
- "5103:5103"
19+
- "5103:80"
2020

2121
catalog.api:
2222
environment:
2323
- ASPNETCORE_ENVIRONMENT=Development
24-
- ASPNETCORE_URLS=http://0.0.0.0:5101
24+
- ASPNETCORE_URLS=http://0.0.0.0:80
2525
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
2626
- 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.
2727
- EventBusConnection=rabbitmq
2828
ports:
29-
- "5101:5101"
29+
- "5101:80"
3030

3131
identity.api:
3232
environment:
3333
- ASPNETCORE_ENVIRONMENT=Development
34-
- ASPNETCORE_URLS=http://0.0.0.0:5105
34+
- ASPNETCORE_URLS=http://0.0.0.0:80
3535
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
3636
- 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
3737
- ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
3838
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5105.
3939
ports:
40-
- "5105:5105"
40+
- "5105:80"
4141

4242
ordering.api:
4343
environment:
4444
- ASPNETCORE_ENVIRONMENT=Development
45-
- ASPNETCORE_URLS=http://0.0.0.0:5102
45+
- ASPNETCORE_URLS=http://0.0.0.0:80
4646
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
47-
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
47+
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
4848
- EventBusConnection=rabbitmq
4949
ports:
50-
- "5102:5102"
50+
- "5102:80"
5151

5252
webspa:
5353
environment:
5454
- ASPNETCORE_ENVIRONMENT=Development
55-
- ASPNETCORE_URLS=http://0.0.0.0:5104
55+
- ASPNETCORE_URLS=http://0.0.0.0:80
5656
- CatalogUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101
5757
- OrderingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
5858
- IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
5959
- BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
60-
- CatalogUrlHC=http://catalog.api:5101/hc
61-
- OrderingUrlHC=http://ordering.api:5102/hc
62-
- IdentityUrlHC=http://identity.api:5105/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
63-
- BasketUrlHC=http://basket.api:5103/hc
60+
- CatalogUrlHC=http://catalog.api/hc
61+
- OrderingUrlHC=http://ordering.api/hc
62+
- IdentityUrlHC=http://identity.api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
63+
- BasketUrlHC=http://basket.api/hc
6464
ports:
65-
- "5104:5104"
65+
- "5104:80"
6666

6767
webmvc:
6868
environment:
6969
- ASPNETCORE_ENVIRONMENT=Development
70-
- ASPNETCORE_URLS=http://0.0.0.0:5100
71-
- CatalogUrl=http://catalog.api:5101
72-
- OrderingUrl=http://ordering.api:5102
73-
- BasketUrl=http://basket.api:5103
70+
- ASPNETCORE_URLS=http://0.0.0.0:80
71+
- CatalogUrl=http://catalog.api
72+
- OrderingUrl=http://ordering.api
73+
- BasketUrl=http://basket.api
7474
- IdentityUrl=http://10.0.75.1:5105 #Local: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser.
7575
#Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
7676
ports:
77-
- "5100:5100"
77+
- "5100:80"
7878

7979
sql.data:
8080
environment:
@@ -86,12 +86,12 @@ services:
8686
webstatus:
8787
environment:
8888
- ASPNETCORE_ENVIRONMENT=Development
89-
- ASPNETCORE_URLS=http://0.0.0.0:5107
90-
- CatalogUrl=http://catalog.api:5101/hc
91-
- OrderingUrl=http://ordering.api:5102/hc
92-
- BasketUrl=http://basket.api:5103/hc
93-
- IdentityUrl=http://identity.api:5105/hc
94-
- mvc=http://webmvc:5100/hc
95-
- spa=http://webspa:5104/hc
89+
- ASPNETCORE_URLS=http://0.0.0.0:80
90+
- CatalogUrl=http://catalog.api/hc
91+
- OrderingUrl=http://ordering.api/hc
92+
- BasketUrl=http://basket.api/hc
93+
- IdentityUrl=http://identity.api/hc
94+
- mvc=http://webmvc/hc
95+
- spa=http://webspa/hc
9696
ports:
97-
- "5107:5107"
97+
- "5107:80"

‎docker-compose.prod.yml‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,69 +16,69 @@ services:
1616
basket.api:
1717
environment:
1818
- ASPNETCORE_ENVIRONMENT=Production
19-
- ASPNETCORE_URLS=http://0.0.0.0:5103
19+
- ASPNETCORE_URLS=http://0.0.0.0:80
2020
- ConnectionString=basket.data
21-
- identityUrl=http://identity.api:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
21+
- identityUrl=http://identity.api #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
2222
- EventBusConnection=rabbitmq
2323
ports:
24-
- "5103:5103"
24+
- "5103:80"
2525

2626
catalog.api:
2727
environment:
2828
- ASPNETCORE_ENVIRONMENT=Production
29-
- ASPNETCORE_URLS=http://0.0.0.0:5101
29+
- ASPNETCORE_URLS=http://0.0.0.0:80
3030
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
3131
- ExternalCatalogBaseUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
3232
- EventBusConnection=rabbitmq
3333
ports:
34-
- "5101:5101"
34+
- "5101:80"
3535

3636
identity.api:
3737
environment:
3838
- ASPNETCORE_ENVIRONMENT=Production
39-
- ASPNETCORE_URLS=http://0.0.0.0:5105
39+
- ASPNETCORE_URLS=http://0.0.0.0:80
4040
- SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
4141
- ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
4242
- MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your host's firewall at range 5100-5105.
4343
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
4444
ports:
45-
- "5105:5105"
45+
- "5105:80"
4646

4747
ordering.api:
4848
environment:
4949
- ASPNETCORE_ENVIRONMENT=Production
50-
- ASPNETCORE_URLS=http://0.0.0.0:5102
50+
- ASPNETCORE_URLS=http://0.0.0.0:80
5151
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
52-
- identityUrl=http://identity.api:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
52+
- identityUrl=http://identity.api #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
5353
- EventBusConnection=rabbitmq
5454
ports:
55-
- "5102:5102"
55+
- "5102:80"
5656

5757
webspa:
5858
environment:
5959
- ASPNETCORE_ENVIRONMENT=Production
60-
- ASPNETCORE_URLS=http://0.0.0.0:5104
60+
- ASPNETCORE_URLS=http://0.0.0.0:80
6161
- CatalogUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101
6262
- OrderingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
6363
- IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
6464
- BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
65-
- CatalogUrlHC=http://catalog.api:5101/hc
66-
- OrderingUrlHC=http://ordering.api:5102/hc
67-
- IdentityUrlHC=http://identity.api:5105/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
68-
- BasketUrlHC=http://basket.api:5103/hc
65+
- CatalogUrlHC=http://catalog.api/hc
66+
- OrderingUrlHC=http://ordering.api/hc
67+
- IdentityUrlHC=http://identity.api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
68+
- BasketUrlHC=http://basket.api/hc
6969
ports:
70-
- "5104:5104"
70+
- "5104:80"
7171

7272
webmvc:
7373
environment:
7474
- ASPNETCORE_ENVIRONMENT=Production
75-
- ASPNETCORE_URLS=http://0.0.0.0:5100
76-
- CatalogUrl=http://catalog.api:5101
77-
- OrderingUrl=http://ordering.api:5102
75+
- ASPNETCORE_URLS=http://0.0.0.0:80
76+
- CatalogUrl=http://catalog.api
77+
- OrderingUrl=http://ordering.api
7878
- IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
79-
- BasketUrl=http://basket.api:5103
79+
- BasketUrl=http://basket.api
8080
ports:
81-
- "5100:5100"
81+
- "5100:80"
8282

8383
sql.data:
8484
environment:
@@ -90,12 +90,13 @@ services:
9090
webstatus:
9191
environment:
9292
- ASPNETCORE_ENVIRONMENT=Production
93-
- ASPNETCORE_URLS=http://0.0.0.0:5107
94-
- CatalogUrl=http://catalog.api:5101/hc
95-
- OrderingUrl=http://ordering.api:5102/hc
96-
- BasketUrl=http://basket.api:5103/hc
97-
- mvc=http://webmvc:5100/hc
98-
- spa=http://webspa:5104/hc
99-
- IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
93+
- ASPNETCORE_URLS=http://0.0.0.0:80
94+
- CatalogUrl=http://catalog.api/hc
95+
- OrderingUrl=http://ordering.api/hc
96+
- BasketUrl=http://basket.api/hc
97+
- IdentityUrl=http://identity.api/hc
98+
- mvc=http://webmvc/hc
99+
- spa=http://webspa/hc
100+
100101
ports:
101-
- "5107:5107"
102+
- "5107:80"

0 commit comments

Comments
 (0)