Skip to content

Commit 540f64d

Browse files
eiximeniseiximenis
committed
Merge branch 'containers-on-80' into dev
2 parents e3f4388 + 85b7df6 commit 540f64d

9 files changed

Lines changed: 101 additions & 153 deletions

‎_docker/rabbitmq/Dockerfile.nanowin‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎_docker/rabbitmq/enabled_plugins‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_docker/rabbitmq/rabbitmq.config‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_docker/redis/Dockerfile.nanowin‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎docker-compose-windows.override.yml‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,65 +11,69 @@ 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
- 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
59+
- CatalogUrlHC=http://catalog.api/hc
60+
- OrderingUrlHC=http://ordering.api/hc
61+
- IdentityUrlHC=http://identity.api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
62+
- BasketUrlHC=http://basket.api/hc
5963
ports:
60-
- "5104:5104"
64+
- "5104:80"
6165

6266
webmvc:
6367
environment:
6468
- 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
69+
- ASPNETCORE_URLS=http://0.0.0.0:80
70+
- CatalogUrl=http://catalog.api
71+
- OrderingUrl=http://ordering.api
72+
- BasketUrl=http://basket.api
6973
- IdentityUrl=http://10.0.75.1:5105 #Local: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser.
7074
#Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
7175
ports:
72-
- "5100:5100"
76+
- "5100:80"
7377

7478
sql.data:
7579
environment:

‎docker-compose-windows.prod.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,61 +16,65 @@ 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
ports:
2323
- "5103:5103"
2424

2525
catalog.api:
2626
environment:
2727
- ASPNETCORE_ENVIRONMENT=Production
28-
- ASPNETCORE_URLS=http://0.0.0.0:5101
28+
- ASPNETCORE_URLS=http://0.0.0.0:80
2929
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
3030
- 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.
3131
ports:
32-
- "5101:5101"
32+
- "5101:80"
3333

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

4444
ordering.api:
4545
environment:
4646
- ASPNETCORE_ENVIRONMENT=Production
47-
- ASPNETCORE_URLS=http://0.0.0.0:5102
47+
- ASPNETCORE_URLS=http://0.0.0.0:80
4848
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
4949
- identityUrl=http://identity.api:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
5050
ports:
51-
- "5102:5102"
51+
- "5102:80"
5252

5353
webspa:
5454
environment:
5555
- ASPNETCORE_ENVIRONMENT=Production
56-
- ASPNETCORE_URLS=http://0.0.0.0:5104
56+
- ASPNETCORE_URLS=http://0.0.0.0
5757
- CatalogUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101
5858
- OrderingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
5959
- 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.
6060
- BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
61+
- CatalogUrlHC=http://catalog.api/hc
62+
- OrderingUrlHC=http://ordering.api/hc
63+
- IdentityUrlHC=http://identity.api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
64+
- BasketUrlHC=http://basket.api/hc
6165
ports:
62-
- "5104:5104"
66+
- "5104:80"
6367

6468
webmvc:
6569
environment:
6670
- ASPNETCORE_ENVIRONMENT=Production
67-
- ASPNETCORE_URLS=http://0.0.0.0:5100
68-
- CatalogUrl=http://catalog.api:5101
69-
- OrderingUrl=http://ordering.api:5102
71+
- ASPNETCORE_URLS=http://0.0.0.0:80
72+
- CatalogUrl=http://catalog.api
73+
- OrderingUrl=http://ordering.api
7074
- 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.
71-
- BasketUrl=http://basket.api:5103
75+
- BasketUrl=http://basket.api
7276
ports:
73-
- "5100:5100"
77+
- "5100:80"
7478

7579
sql.data:
7680
environment:

‎docker-compose-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ services:
5858
image: microsoft/mssql-server-windows
5959

6060
basket.data:
61-
image: eshop/redis-win
61+
image: redis:nanoserver
6262
# build:
6363
# context: ./_docker/redis
6464
# dockerfile: Dockerfile.nanowin
6565
ports:
6666
- "6379:6379"
6767

6868
rabbitmq:
69-
image: eshop/rabbitmq-win
69+
image: spring2/rabbitmq
7070
# build:
7171
# context: ./_docker/rabbitmq
7272
# dockerfile: Dockerfile.nanowin

‎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"

0 commit comments

Comments
 (0)