Skip to content

Commit 77de525

Browse files
eiximeniseiximenis
committed
Merge branch 'windows-containers'
2 parents a07bb18 + faa24c7 commit 77de525

24 files changed

Lines changed: 722 additions & 0 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,3 +254,6 @@ pub/
254254
/src/Web/WebMVC/Properties/PublishProfiles/eShopOnContainersWebMVC2016 - Web Deploy-publish.ps1
255255
/src/Web/WebMVC/Properties/PublishProfiles/publish-module.psm1
256256
/src/Services/Identity/eShopOnContainers.Identity/Properties/launchSettings.json
257+
258+
#Ignore marker-file used to know which docker files we have.
259+
.eshopdocker_*

‎_docker/linux/docker-compose.ci.build.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: '2'
2+
3+
services:
4+
ci-build:
5+
image: microsoft/aspnetcore-build:1.0-1.1
6+
volumes:
7+
- .:/src
8+
working_dir: /src
9+
command: /bin/bash -c "dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"

‎_docker/linux/docker-compose.override.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
version: '2'
2+
3+
services:
4+
5+
basket.api:
6+
environment:
7+
- ASPNETCORE_ENVIRONMENT=Development
8+
- ConnectionString=basket.data
9+
#- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
10+
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
11+
ports:
12+
- "5103:5103"
13+
14+
catalog.api:
15+
environment:
16+
- ASPNETCORE_ENVIRONMENT=Development
17+
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
18+
#- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105.
19+
- ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
20+
ports:
21+
- "5101:5101"
22+
23+
identity.api:
24+
environment:
25+
- ASPNETCORE_ENVIRONMENT=Development
26+
- SpaClient=http://localhost:5104
27+
- ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
28+
#- MvcClient=http://13.88.8.119:5100 #Remote: VM Needs to have public access at 5105.
29+
- MvcClient=http://localhost:5100 #Local: You need to open your local dev-machine firewall at range 5100-5105.
30+
ports:
31+
- "5105:5105"
32+
33+
ordering.api:
34+
environment:
35+
- ASPNETCORE_ENVIRONMENT=Development
36+
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
37+
#- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
38+
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
39+
ports:
40+
- "5102:5102"
41+
42+
webspa:
43+
environment:
44+
- ASPNETCORE_ENVIRONMENT=Development
45+
- CatalogUrl=http://localhost:5101
46+
- OrderingUrl=http://localhost:5102
47+
#- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
48+
- IdentityUrl=http://localhost:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
49+
- BasketUrl=http://localhost:5103
50+
ports:
51+
- "5104:5104"
52+
53+
webmvc:
54+
environment:
55+
- ASPNETCORE_ENVIRONMENT=Development
56+
- CatalogUrl=http://catalog.api:5101
57+
- OrderingUrl=http://ordering.api:5102
58+
#- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
59+
- IdentityUrl=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
60+
- BasketUrl=http://basket.api:5103
61+
ports:
62+
- "5100:5100"
63+
64+
sql.data:
65+
environment:
66+
- SA_PASSWORD=Pass@word
67+
- ACCEPT_EULA=Y
68+
ports:
69+
- "5433:1433"

‎_docker/linux/docker-compose.vs.debug.yml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
version: '2'
2+
3+
services:
4+
basket.api:
5+
image: eshop/basket.api:dev
6+
build:
7+
args:
8+
source: ${DOCKER_BUILD_SOURCE}
9+
environment:
10+
- DOTNET_USE_POLLING_FILE_WATCHER=1
11+
volumes:
12+
- ./src/Services/Basket/Basket.API:/app
13+
- ~/.nuget/packages:/root/.nuget/packages:ro
14+
- ~/clrdbg:/clrdbg:ro
15+
entrypoint: tail -f /dev/null
16+
labels:
17+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
18+
19+
catalog.api:
20+
image: eshop/catalog.api:dev
21+
build:
22+
args:
23+
source: ${DOCKER_BUILD_SOURCE}
24+
environment:
25+
- DOTNET_USE_POLLING_FILE_WATCHER=1
26+
volumes:
27+
- ./src/Services/Catalog/Catalog.API:/app
28+
- ~/.nuget/packages:/root/.nuget/packages:ro
29+
- ~/clrdbg:/clrdbg:ro
30+
entrypoint: tail -f /dev/null
31+
labels:
32+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
33+
34+
identity.api:
35+
image: eshop/identity.api:dev
36+
build:
37+
args:
38+
source: ${DOCKER_BUILD_SOURCE}
39+
environment:
40+
- DOTNET_USE_POLLING_FILE_WATCHER=1
41+
volumes:
42+
- ./src/Services/Identity/Identity.API:/app
43+
- ~/.nuget/packages:/root/.nuget/packages:ro
44+
- ~/clrdbg:/clrdbg:ro
45+
entrypoint: tail -f /dev/null
46+
labels:
47+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
48+
49+
ordering.api:
50+
image: eshop/ordering.api:dev
51+
build:
52+
args:
53+
source: ${DOCKER_BUILD_SOURCE}
54+
environment:
55+
- DOTNET_USE_POLLING_FILE_WATCHER=1
56+
volumes:
57+
- ./src/Services/Ordering/Ordering.API:/app
58+
- ~/.nuget/packages:/root/.nuget/packages:ro
59+
- ~/clrdbg:/clrdbg:ro
60+
entrypoint: tail -f /dev/null
61+
labels:
62+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
63+
64+
webspa:
65+
image: eshop/webspa:dev
66+
build:
67+
args:
68+
source: ${DOCKER_BUILD_SOURCE}
69+
environment:
70+
- DOTNET_USE_POLLING_FILE_WATCHER=1
71+
volumes:
72+
- ./src/Web/WebSPA:/app
73+
- ~/.nuget/packages:/root/.nuget/packages:ro
74+
- ~/clrdbg:/clrdbg:ro
75+
entrypoint: tail -f /dev/null
76+
labels:
77+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
78+
79+
webmvc:
80+
image: eshop/webmvc:dev
81+
build:
82+
args:
83+
source: ${DOCKER_BUILD_SOURCE}
84+
environment:
85+
- DOTNET_USE_POLLING_FILE_WATCHER=1
86+
volumes:
87+
- ./src/Web/WebMVC:/app
88+
- ~/.nuget/packages:/root/.nuget/packages:ro
89+
- ~/clrdbg:/clrdbg:ro
90+
entrypoint: tail -f /dev/null
91+
labels:
92+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"

‎_docker/linux/docker-compose.vs.release.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
version: '2'
2+
3+
services:
4+
basket.api:
5+
build:
6+
args:
7+
source: ${DOCKER_BUILD_SOURCE}
8+
volumes:
9+
- ~/clrdbg:/clrdbg:ro
10+
entrypoint: tail -f /dev/null
11+
labels:
12+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
13+
14+
catalog.api:
15+
build:
16+
args:
17+
source: ${DOCKER_BUILD_SOURCE}
18+
volumes:
19+
- ~/clrdbg:/clrdbg:ro
20+
entrypoint: tail -f /dev/null
21+
labels:
22+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
23+
24+
identity.api:
25+
build:
26+
args:
27+
source: ${DOCKER_BUILD_SOURCE}
28+
volumes:
29+
- ~/clrdbg:/clrdbg:ro
30+
entrypoint: tail -f /dev/null
31+
labels:
32+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
33+
34+
ordering.api:
35+
build:
36+
args:
37+
source: ${DOCKER_BUILD_SOURCE}
38+
volumes:
39+
- ~/clrdbg:/clrdbg:ro
40+
entrypoint: tail -f /dev/null
41+
labels:
42+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
43+
44+
webspa:
45+
build:
46+
args:
47+
source: ${DOCKER_BUILD_SOURCE}
48+
volumes:
49+
- ~/clrdbg:/clrdbg:ro
50+
entrypoint: tail -f /dev/null
51+
labels:
52+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
53+
54+
webmvc:
55+
build:
56+
args:
57+
source: ${DOCKER_BUILD_SOURCE}
58+
volumes:
59+
- ~/clrdbg:/clrdbg:ro
60+
entrypoint: tail -f /dev/null
61+
labels:
62+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"

‎_docker/linux/docker-compose.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
version: '2'
2+
3+
services:
4+
basket.api:
5+
image: eshop/basket.api
6+
build:
7+
context: ./src/Services/Basket/Basket.API
8+
dockerfile: Dockerfile
9+
depends_on:
10+
- basket.data
11+
- identity.api
12+
13+
catalog.api:
14+
image: eshop/catalog.api
15+
build:
16+
context: ./src/Services/Catalog/Catalog.API
17+
dockerfile: Dockerfile
18+
depends_on:
19+
- sql.data
20+
21+
identity.api:
22+
image: eshop/identity.api
23+
build:
24+
context: ./src/Services/Identity/Identity.API
25+
dockerfile: Dockerfile
26+
depends_on:
27+
- sql.data
28+
29+
ordering.api:
30+
image: eshop/ordering.api
31+
build:
32+
context: ./src/Services/Ordering/Ordering.API
33+
dockerfile: Dockerfile
34+
depends_on:
35+
- sql.data
36+
37+
webspa:
38+
image: eshop/webspa
39+
build:
40+
context: ./src/Web/WebSPA
41+
dockerfile: Dockerfile
42+
depends_on:
43+
- identity.api
44+
- basket.api
45+
46+
webmvc:
47+
image: eshop/webmvc
48+
build:
49+
context: ./src/Web/WebMVC
50+
dockerfile: Dockerfile
51+
depends_on:
52+
- catalog.api
53+
- ordering.api
54+
- identity.api
55+
- basket.api
56+
57+
sql.data:
58+
image: microsoft/mssql-server-linux
59+
60+
basket.data:
61+
image: redis
62+
ports:
63+
- "6379:6379"

‎_docker/nanowin/docker-compose.ci.build.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: '2'
2+
3+
services:
4+
ci-build:
5+
image: microsoft/aspnetcore-build:1.0-1.1
6+
volumes:
7+
- .:/src
8+
working_dir: /src
9+
command: /bin/bash -c "dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"

‎_docker/nanowin/docker-compose.override.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
version: '2.1'
2+
3+
services:
4+
5+
basket.api:
6+
environment:
7+
- ASPNETCORE_ENVIRONMENT=Development
8+
- ConnectionString=basket.data
9+
#- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
10+
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
11+
ports:
12+
- "5103:5103"
13+
14+
catalog.api:
15+
environment:
16+
- ASPNETCORE_ENVIRONMENT=Development
17+
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
18+
#- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105.
19+
- ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
20+
ports:
21+
- "5101:5101"
22+
23+
identity.api:
24+
environment:
25+
- ASPNETCORE_ENVIRONMENT=Development
26+
- SpaClient=http://localhost:5104
27+
- ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
28+
#- MvcClient=http://13.88.8.119:5100 #Remote: VM Needs to have public access at 5105.
29+
- MvcClient=http://localhost:5100 #Local: You need to open your local dev-machine firewall at range 5100-5105.
30+
ports:
31+
- "5105:5105"
32+
33+
ordering.api:
34+
environment:
35+
- ASPNETCORE_ENVIRONMENT=Development
36+
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
37+
#- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
38+
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
39+
ports:
40+
- "5102:5102"
41+
42+
webspa:
43+
environment:
44+
- ASPNETCORE_ENVIRONMENT=Development
45+
- CatalogUrl=http://localhost:5101
46+
- OrderingUrl=http://localhost:5102
47+
#- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
48+
- IdentityUrl=http://localhost:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
49+
- BasketUrl=http://localhost:5103
50+
ports:
51+
- "5104:5104"
52+
53+
webmvc:
54+
environment:
55+
- ASPNETCORE_ENVIRONMENT=Development
56+
- CatalogUrl=http://catalog.api:5101
57+
- OrderingUrl=http://ordering.api:5102
58+
#- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
59+
- IdentityUrl=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
60+
- BasketUrl=http://basket.api:5103
61+
ports:
62+
- "5100:5100"
63+
64+
sql.data:
65+
environment:
66+
- SA_PASSWORD=Pass@word
67+
- ACCEPT_EULA=Y
68+
ports:
69+
- "5433:1433"

0 commit comments

Comments
 (0)