diff --git a/docker-compose-external.override.yml b/docker-compose-external.override.yml deleted file mode 100644 index e1a37a501..000000000 --- a/docker-compose-external.override.yml +++ /dev/null @@ -1,17 +0,0 @@ -# -# docker-compose.override.yml is used to set up local configuration environment -# Things like the external ports to use or secrets/passwords depend on the -# specific deployment environment you might be using. -# Further details and docs: https://docs.docker.com/compose/extends/ -# - -version: '2' - -services: - - sql.data: - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5433:1433" diff --git a/docker-compose-external.yml b/docker-compose-external.yml deleted file mode 100644 index 1772cff3a..000000000 --- a/docker-compose-external.yml +++ /dev/null @@ -1,16 +0,0 @@ -# -# docker-compose.yml is used to set up the base config per container to be deployed -# Take into account that when deploying, this base configuration is merged with the -# configuration-per-environment specified at the docker-compose.override.yml -# Further details and docs: https://docs.docker.com/compose/extends/ -# -version: '2' - -services: - sql.data: - image: microsoft/mssql-server-linux - - basket.data: - image: redis - ports: - - "6379:6379" diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml new file mode 100644 index 000000000..0a4b6e345 --- /dev/null +++ b/docker-compose.ci.build.yml @@ -0,0 +1,9 @@ +version: '2' + +services: + ci-build: + image: microsoft/aspnetcore-build:1.0-1.1 + volumes: + - .:/src + working_dir: /src + command: /bin/bash -c "dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish" diff --git a/docker-compose.dcproj b/docker-compose.dcproj new file mode 100644 index 000000000..44b5c682f --- /dev/null +++ b/docker-compose.dcproj @@ -0,0 +1,22 @@ + + + + fea0c318-ffed-4d39-8781-265718ca43dd + True + http://localhost:{ServicePort}/api/values + basket.api + + + + + docker-compose.yml + + + docker-compose.yml + + + docker-compose.yml + + + + \ No newline at end of file diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 41b08da1c..c07f0081d 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,36 +1,9 @@ -# -# docker-compose.override.yml is used to set up local configuration environment -# Things like the external ports to use or secrets/passwords depend on the -# specific deployment environment you might be using. -# Further details and docs: https://docs.docker.com/compose/extends/ -# - version: '2' services: - - webmvc: - environment: - - CatalogUrl=http://catalog.api:5101 - - OrderingUrl=http://ordering.api:5102 - #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - - 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. - - BasketUrl=http://basket.api:5103 - ports: - - "5100:5100" - - webspa: - environment: - - CatalogUrl=http://10.0.75.1:5101 - - OrderingUrl=http://10.0.75.1:5102 - #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - - 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. - - BasketUrl=http://10.0.75.1:5103 - ports: - - "5104:5104" - basket.api: environment: + - ASPNETCORE_ENVIRONMENT=Development - ConnectionString=basket.data #- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - 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. @@ -39,32 +12,58 @@ services: catalog.api: environment: + - ASPNETCORE_ENVIRONMENT=Development - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word #- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105. - ExternalCatalogBaseUrl=http://10.0.75.1:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. ports: - "5101:5101" + + identity.api: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - SpaClient=http://localhost:5104 + - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word + #- MvcClient=http://13.88.8.119:5100 #Remote: VM Needs to have public access at 5105. + - MvcClient=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. + ports: + - "5105:5105" + ordering.api: environment: + - ASPNETCORE_ENVIRONMENT=Development - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word #- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - 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. ports: - "5102:5102" - identity.service: + eshoponcontainers.webspa: environment: - - SpaClient=http://localhost:5104 - - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word - #- MvcClient=http://13.88.8.119:5100 #Remote: VM Needs to have public access at 5105. - - MvcClient=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. + - ASPNETCORE_ENVIRONMENT=Development + - CatalogUrl=http://10.0.75.1:5101 + - OrderingUrl=http://10.0.75.1:5102 + #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. + - 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. + - BasketUrl=http://10.0.75.1:5103 ports: - - "5105:5105" + - "5104:5104" + + webmvc: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - CatalogUrl=http://catalog.api:5101 + - OrderingUrl=http://ordering.api:5102 + #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. + - 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. + - BasketUrl=http://basket.api:5103 + ports: + - "5100:5100" sql.data: environment: - SA_PASSWORD=Pass@word - ACCEPT_EULA=Y ports: - - "5433:1433" + - "5433:1433" \ No newline at end of file diff --git a/docker-compose.vs.debug.yml b/docker-compose.vs.debug.yml new file mode 100644 index 000000000..7a43e4364 --- /dev/null +++ b/docker-compose.vs.debug.yml @@ -0,0 +1,92 @@ +version: '2' + +services: + basket.api: + image: basket.api:dev + build: + args: + source: ${DOCKER_BUILD_SOURCE} + environment: + - DOTNET_USE_POLLING_FILE_WATCHER=1 + volumes: + - ./src/Services/Basket/Basket.API:/app + - ~/.nuget/packages:/root/.nuget/packages:ro + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + catalog.api: + image: catalog.api:dev + build: + args: + source: ${DOCKER_BUILD_SOURCE} + environment: + - DOTNET_USE_POLLING_FILE_WATCHER=1 + volumes: + - ./src/Services/Catalog/Catalog.API:/app + - ~/.nuget/packages:/root/.nuget/packages:ro + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + identity.api: + image: identity.api:dev + build: + args: + source: ${DOCKER_BUILD_SOURCE} + environment: + - DOTNET_USE_POLLING_FILE_WATCHER=1 + volumes: + - ./src/Services/Identity/Identity.API:/app + - ~/.nuget/packages:/root/.nuget/packages:ro + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + ordering.api: + image: ordering.api:dev + build: + args: + source: ${DOCKER_BUILD_SOURCE} + environment: + - DOTNET_USE_POLLING_FILE_WATCHER=1 + volumes: + - ./src/Services/Ordering/Ordering.API:/app + - ~/.nuget/packages:/root/.nuget/packages:ro + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + eshoponcontainers.webspa: + image: eshoponcontainers.webspa:dev + build: + args: + source: ${DOCKER_BUILD_SOURCE} + environment: + - DOTNET_USE_POLLING_FILE_WATCHER=1 + volumes: + - ./src/Web/WebSPA/eShopOnContainers.WebSPA:/app + - ~/.nuget/packages:/root/.nuget/packages:ro + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + webmvc: + image: webmvc:dev + build: + args: + source: ${DOCKER_BUILD_SOURCE} + environment: + - DOTNET_USE_POLLING_FILE_WATCHER=1 + volumes: + - ./src/Web/WebMVC:/app + - ~/.nuget/packages:/root/.nuget/packages:ro + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" diff --git a/docker-compose.vs.release.yml b/docker-compose.vs.release.yml new file mode 100644 index 000000000..17248ac5c --- /dev/null +++ b/docker-compose.vs.release.yml @@ -0,0 +1,62 @@ +version: '2' + +services: + basket.api: + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + catalog.api: + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + identity.api: + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + ordering.api: + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + eshoponcontainers.webspa: + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" + + webmvc: + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - ~/clrdbg:/clrdbg:ro + entrypoint: tail -f /dev/null + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=linux" diff --git a/docker-compose.yml b/docker-compose.yml index 164e12653..094e9e2c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,45 +1,57 @@ -# -# docker-compose.yml is used to set up the base config per container to be deployed -# Take into account that when deploying, this base configuration is merged with the -# configuration-per-environment specified at the docker-compose.override.yml -# Further details and docs: https://docs.docker.com/compose/extends/ -# version: '2' services: - webmvc: - image: eshop/web - depends_on: - - identity.service - - basket.api - - webspa: - image: eshop/webspa - depends_on: - - basket.api - - identity.service - basket.api: - image: eshop/basket.api + image: basket.api + build: + context: ./src/Services/Basket/Basket.API + dockerfile: Dockerfile depends_on: - basket.data - - identity.service + - identity.api catalog.api: - image: eshop/catalog.api + image: catalog.api + build: + context: ./src/Services/Catalog/Catalog.API + dockerfile: Dockerfile depends_on: - sql.data - ordering.api: - image: eshop/ordering.api + identity.api: + image: identity.api + build: + context: ./src/Services/Identity/Identity.API + dockerfile: Dockerfile depends_on: - sql.data - identity.service: - image: eshop/identity + ordering.api: + image: ordering.api + build: + context: ./src/Services/Ordering/Ordering.API + dockerfile: Dockerfile depends_on: - sql.data + eshoponcontainers.webspa: + image: eshoponcontainers.webspa + build: + context: ./src/Web/WebSPA/eShopOnContainers.WebSPA + dockerfile: Dockerfile + depends_on: + - identity.api + - basket.api + + webmvc: + image: webmvc + build: + context: ./src/Web/WebMVC + dockerfile: Dockerfile + depends_on: + - identity.api + - basket.api + sql.data: image: microsoft/mssql-server-linux diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln index fd88b260e..fe855d789 100644 --- a/eShopOnContainers-ServicesAndWebApps.sln +++ b/eShopOnContainers-ServicesAndWebApps.sln @@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}" ProjectSection(SolutionItems) = preProject - docker-compose.override.yml = docker-compose.override.yml - docker-compose.yml = docker-compose.yml NuGet.config = NuGet.config EndProjectSection EndProject @@ -48,6 +46,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest", "test\Services\U EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.API", "src\Services\Identity\Identity.API\Identity.API.csproj", "{A579E108-5445-403D-A407-339AC4D1611B}" EndProject +Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -446,6 +446,54 @@ Global {A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.Build.0 = Release|Any CPU {A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.ActiveCfg = Release|Any CPU {A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.Build.0 = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|ARM.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhone.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x64.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.AppStore|x86.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|ARM.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhone.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x64.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.ActiveCfg = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Debug|x86.Build.0 = Debug|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|Any CPU.Build.0 = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.ActiveCfg = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|ARM.Build.0 = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.ActiveCfg = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhone.Build.0 = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.ActiveCfg = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.Build.0 = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.ActiveCfg = Release|Any CPU + {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Console/eShopConsole/.dockerignore b/src/Console/eShopConsole/.dockerignore deleted file mode 100644 index 63d337d41..000000000 --- a/src/Console/eShopConsole/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -docker-compose.yml -Dockerfile diff --git a/src/Console/eShopConsole/Dockerfile b/src/Console/eShopConsole/Dockerfile deleted file mode 100644 index fbeb2ec0c..000000000 --- a/src/Console/eShopConsole/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM microsoft/dotnet:1.0.1-core -ENTRYPOINT ["dotnet", "eShopConsole.dll"] -ARG source=. -WORKDIR /app -COPY $source . diff --git a/src/Console/eShopConsole/docker-compose.dev.debug.yml b/src/Console/eShopConsole/docker-compose.dev.debug.yml deleted file mode 100644 index c4d3f6941..000000000 --- a/src/Console/eShopConsole/docker-compose.dev.debug.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '2' - -services: - eshopconsole: - build: - args: - source: obj/Docker/empty/ - labels: - - "com.microsoft.visualstudio.targetoperatingsystem=linux" - volumes: - - .:/app - - ~/.nuget/packages:/root/.nuget/packages:ro - - ~/clrdbg:/clrdbg:ro - entrypoint: tail -f /dev/null diff --git a/src/Console/eShopConsole/docker-compose.dev.release.yml b/src/Console/eShopConsole/docker-compose.dev.release.yml deleted file mode 100644 index 7b12940a7..000000000 --- a/src/Console/eShopConsole/docker-compose.dev.release.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '2' - -services: - eshopconsole: - labels: - - "com.microsoft.visualstudio.targetoperatingsystem=linux" - volumes: - - ~/clrdbg:/clrdbg:ro - entrypoint: tail -f /dev/null diff --git a/src/Console/eShopConsole/docker-compose.yml b/src/Console/eShopConsole/docker-compose.yml deleted file mode 100644 index 0f18b6ca3..000000000 --- a/src/Console/eShopConsole/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '2' - -services: - eshopconsole: - image: user/eshopconsole${TAG} - build: - context: . - dockerfile: Dockerfile diff --git a/src/Services/Basket/Basket.API/.dockerignore b/src/Services/Basket/Basket.API/.dockerignore index 63d337d41..d8f8175f6 100644 --- a/src/Services/Basket/Basket.API/.dockerignore +++ b/src/Services/Basket/Basket.API/.dockerignore @@ -1,2 +1,3 @@ -docker-compose.yml -Dockerfile +* +!obj/Docker/publish/* +!obj/Docker/empty/ diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index c0a11ef9d..bd9f27fd6 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -1,4 +1,4 @@ - + netcoreapp1.1 @@ -9,6 +9,7 @@ Basket.API 1.1.0 $(PackageTargetFallback);netstandard1.6.1;dnxcore50;portable-net451+win8 + ..\..\..\..\docker-compose.dcproj diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index bd3bad87b..bfc575ee1 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -1,6 +1,6 @@ FROM microsoft/aspnetcore:1.1 -ENTRYPOINT ["dotnet", "Basket.API.dll"] -ARG source=. +ARG source WORKDIR /app -ENV ASPNETCORE_URLS http://*:5103 -COPY $source . +EXPOSE 80 +COPY ${source:-obj/Docker/publish} . +ENTRYPOINT ["dotnet", "Basket.API.dll"] diff --git a/src/Services/Basket/Basket.API/docker-compose.yml b/src/Services/Basket/Basket.API/docker-compose.yml deleted file mode 100644 index 0935fc210..000000000 --- a/src/Services/Basket/Basket.API/docker-compose.yml +++ /dev/null @@ -1,40 +0,0 @@ -version: '2' - -services: - basket.api: - image: eshop/basket.api - environment: - - ConnectionString=basket.data - #- identityUrl=http://104.40.62.65:5105 #Remote: VM Needs to have public access at 5105. - - identityUrl=http://identity.service:5105 #Local: You need a entry in windows host file to run identity in local docker. - build: - context: . - dockerfile: Dockerfile - ports: - - "5103:5103" - depends_on: - - basket.data - - identity.service - - basket.data: - image: redis - - identity.service: - image: eshop/identity - environment: - - SpaClient=http://localhost:5104 - - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word - #- MvcClient=http://104.40.62.65:5100 #Remote: VM Needs to have public access at 5105. - - MvcClient=http://localhost:5100 #Local: You need a entry in windows host file to run identity in local docker. - ports: - - "5105:5105" - depends_on: - - identity.data - - identity.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5433:1433" diff --git a/src/Services/Catalog/Catalog.API/.dockerignore b/src/Services/Catalog/Catalog.API/.dockerignore new file mode 100644 index 000000000..d8f8175f6 --- /dev/null +++ b/src/Services/Catalog/Catalog.API/.dockerignore @@ -0,0 +1,3 @@ +* +!obj/Docker/publish/* +!obj/Docker/empty/ diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 9ec9eee72..fba70291c 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -1,4 +1,4 @@ - + netcoreapp1.1 @@ -10,6 +10,7 @@ aspnet-Catalog.API-20161122013618 1.1.0 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + ..\..\..\..\docker-compose.dcproj diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index b2148694a..67f47d60d 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -1,5 +1,6 @@ FROM microsoft/aspnetcore:1.1 +ARG source WORKDIR /app EXPOSE 80 -COPY . /app -ENTRYPOINT dotnet Catalog.API.dll \ No newline at end of file +COPY ${source:-obj/Docker/publish} . +ENTRYPOINT ["dotnet", "Catalog.API.dll"] diff --git a/src/Services/Catalog/Catalog.API/docker-compose.yml b/src/Services/Catalog/Catalog.API/docker-compose.yml deleted file mode 100644 index d08b67180..000000000 --- a/src/Services/Catalog/Catalog.API/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: '2' - -services: - catalog.api: - image: eshop/catalog.api - environment: - - ConnectionString=Server=catalog.data;Initial Catalog=CatalogData;User Id=sa;Password=Pass@word - expose: - - "80" - ports: - - "5101:80" - depends_on: - - catalog.data - - catalog.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5434:1433" diff --git a/src/Services/Identity/Identity.API/.dockerignore b/src/Services/Identity/Identity.API/.dockerignore new file mode 100644 index 000000000..d8f8175f6 --- /dev/null +++ b/src/Services/Identity/Identity.API/.dockerignore @@ -0,0 +1,3 @@ +* +!obj/Docker/publish/* +!obj/Docker/empty/ diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index 5eb4acdb6..5ef6b4064 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -1,6 +1,6 @@ FROM microsoft/aspnetcore:1.1 -ENTRYPOINT ["dotnet", "Identity.API.dll"] -ARG source=. +ARG source WORKDIR /app -ENV ASPNETCORE_URLS http://*:5105 -COPY $source . +EXPOSE 80 +COPY ${source:-obj/Docker/publish} . +ENTRYPOINT ["dotnet", "Identity.API.dll"] diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 045003747..5ce6858e7 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -1,7 +1,7 @@ - + - netcoreapp1.0 + netcoreapp1.1 portable true Identity.API @@ -10,6 +10,7 @@ aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5 1.1.0 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + ..\..\..\..\docker-compose.dcproj diff --git a/src/Services/Identity/Identity.API/docker-compose.yml b/src/Services/Identity/Identity.API/docker-compose.yml deleted file mode 100644 index 72933a273..000000000 --- a/src/Services/Identity/Identity.API/docker-compose.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: '2' - -services: - identity.service: - image: eshop/identity - environment: - - SpaClient=http://localhost:5104 - - ConnectionStrings__DefaultConnection=Server=identity.data;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word - #- MvcClient=http://104.40.62.65:5100 #Remote: VM Needs to have public access at 5105. - - MvcClient=http://localhost:5100 #Local: You need a entry in windows host file to run identity in local docker. - ports: - - "5105:5105" - depends_on: - - identity.data - - sql.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5433:1433" diff --git a/src/Services/Ordering/Ordering.API/.dockerignore b/src/Services/Ordering/Ordering.API/.dockerignore index 63d337d41..d8f8175f6 100644 --- a/src/Services/Ordering/Ordering.API/.dockerignore +++ b/src/Services/Ordering/Ordering.API/.dockerignore @@ -1,2 +1,3 @@ -docker-compose.yml -Dockerfile +* +!obj/Docker/publish/* +!obj/Docker/empty/ diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index 6a736c1fc..719bff2f4 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -1,8 +1,6 @@ FROM microsoft/aspnetcore:1.1 - -# Entry point through the copied assembly -ENTRYPOINT ["dotnet", "Ordering.API.dll"] -ARG source=. +ARG source WORKDIR /app -ENV ASPNETCORE_URLS http://*:5102 -COPY $source . +EXPOSE 80 +COPY ${source:-obj/Docker/publish} . +ENTRYPOINT ["dotnet", "Ordering.API.dll"] diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 0e118e0a1..67b533c8c 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -1,4 +1,4 @@ - + netcoreapp1.1 @@ -10,6 +10,7 @@ aspnet-Ordering.API-20161122013547 1.1.0 $(PackageTargetFallback);netstandard1.6.1;dnxcore50;portable-net451+win8 + ..\..\..\..\docker-compose.dcproj diff --git a/src/Services/Ordering/Ordering.API/docker-compose.yml b/src/Services/Ordering/Ordering.API/docker-compose.yml deleted file mode 100644 index fa2f70fb7..000000000 --- a/src/Services/Ordering/Ordering.API/docker-compose.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: '2' - -services: - ordering.api: - image: eshop/ordering.api - environment: - - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word - ports: - - "5102:80" - depends_on: - - ordering.data - - ordering.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5432:1433" - - identity.service: - image: eshop/identity - environment: - - SpaClient=http://localhost:5104 - - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word - #- MvcClient=http://104.40.62.65:5100 #Remote: VM Needs to have public access at 5105. - - MvcClient=http://localhost:5100 #Local: You need a entry in windows host file to run identity in local docker. - ports: - - "5105:5105" - depends_on: - - identity.data - - identity.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5433:1433" \ No newline at end of file diff --git a/src/Web/WebMVC/.dockerignore b/src/Web/WebMVC/.dockerignore index 63d337d41..d8f8175f6 100644 --- a/src/Web/WebMVC/.dockerignore +++ b/src/Web/WebMVC/.dockerignore @@ -1,2 +1,3 @@ -docker-compose.yml -Dockerfile +* +!obj/Docker/publish/* +!obj/Docker/empty/ diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index 7ae55f27e..48252930c 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -1,6 +1,6 @@ FROM microsoft/aspnetcore:1.1 -ENTRYPOINT ["dotnet", "WebMVC.dll"] -ARG source=. +ARG source WORKDIR /app -ENV ASPNETCORE_URLS http://0.0.0.0:5100 -COPY $source . +EXPOSE 80 +COPY ${source:-obj/Docker/publish} . +ENTRYPOINT ["dotnet", "WebMVC.dll"] diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 22d7faeae..41100b146 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -1,7 +1,7 @@ - + - netcoreapp1.0 + netcoreapp1.1 portable true WebMVC @@ -10,6 +10,7 @@ aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3 1.1.0 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + ..\..\..\docker-compose.dcproj diff --git a/src/Web/WebMVC/docker-compose.dev.debug.yml b/src/Web/WebMVC/docker-compose.dev.debug.yml deleted file mode 100644 index 85e1b082c..000000000 --- a/src/Web/WebMVC/docker-compose.dev.debug.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '2' - -services: - webmvc: - build: - args: - source: obj/Docker/empty/ - labels: - - "com.microsoft.visualstudio.targetoperatingsystem=linux" - environment: - - ASPNETCORE_ENVIRONMENT=Development - - DOTNET_USE_POLLING_FILE_WATCHER=1 - volumes: - - .:/app - - ~/.nuget/packages:/root/.nuget/packages:ro - - ~/clrdbg:/clrdbg:ro - entrypoint: tail -f /dev/null diff --git a/src/Web/WebMVC/docker-compose.dev.release.yml b/src/Web/WebMVC/docker-compose.dev.release.yml deleted file mode 100644 index 901845620..000000000 --- a/src/Web/WebMVC/docker-compose.dev.release.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '2' - -services: - webmvc: - labels: - - "com.microsoft.visualstudio.targetoperatingsystem=linux" - volumes: - - ~/clrdbg:/clrdbg:ro - entrypoint: tail -f /dev/null diff --git a/src/Web/WebMVC/docker-compose.yml b/src/Web/WebMVC/docker-compose.yml deleted file mode 100644 index 849abfbc2..000000000 --- a/src/Web/WebMVC/docker-compose.yml +++ /dev/null @@ -1,95 +0,0 @@ -version: '2' - -services: - webmvc: - image: eshop/web${TAG} - build: - context: . - dockerfile: Dockerfile - environment: - - CatalogUrl=http://catalog.api - - OrderingUrl=http://ordering.api - #- IdentityUrl=http://104.40.62.65:5105 - - IdentityUrl=http://identity.service:5105 #You need a entry in windows host file. - - BasketUrl=http://basket.api - - ASPNETCORE_ENVIRONMENT=Development - ports: - - "5100:5100" - depends_on: - - identity.service - - basket.api - links: - - identity.service:localhost # This line should be removed - - identity.service: - image: eshop/identity - environment: - - Spa=http://webspa - - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word - - Mvc=http://webmvc - ports: - - "5105:5105" - depends_on: - - identity.data - - identity.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5433:1433" - - basket.api: - image: eshop/basket.api - environment: - - ConnectionString=basket.data - #- identityUrl=http://104.40.62.65:5105 - - identityUrl=http://identity.service:5105 - build: - context: . - dockerfile: Dockerfile - ports: - - "5103:80" - depends_on: - - basket.data - - identity.service - - basket.data: - image: redis - - catalog.api: - image: eshop/catalog.api - environment: - - ConnectionString=Server=catalog.data;Database=CatalogDB;User Id=sa;Password=Pass@word - expose: - - "80" - ports: - - "5101:80" - depends_on: - - catalog.data - - catalog.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5434:1433" - - ordering.api: - image: eshop/ordering.api - environment: - - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word - ports: - - "5102:80" - depends_on: - - ordering.data - - ordering.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5432:1433" diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/.dockerignore b/src/Web/WebSPA/eShopOnContainers.WebSPA/.dockerignore new file mode 100644 index 000000000..d8f8175f6 --- /dev/null +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/.dockerignore @@ -0,0 +1,3 @@ +* +!obj/Docker/publish/* +!obj/Docker/empty/ diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile b/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile index b55f7527c..77306b6df 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile @@ -1,8 +1,6 @@ FROM microsoft/aspnetcore:1.1 -ENTRYPOINT ["dotnet", "eShopOnContainers.WebSPA.dll"] -ARG source=. +ARG source WORKDIR /app -ENV ASPNETCORE_URLS http://0.0.0.0:5104 -COPY $source . - - +EXPOSE 80 +COPY ${source:-obj/Docker/publish} . +ENTRYPOINT ["dotnet", "eShopOnContainers.WebSPA.dll"] diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/docker-compose.yml b/src/Web/WebSPA/eShopOnContainers.WebSPA/docker-compose.yml deleted file mode 100644 index 138573be5..000000000 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/docker-compose.yml +++ /dev/null @@ -1,91 +0,0 @@ -version: '2' - -services: - webspa: - image: eshop/webspa - build: - context: . - dockerfile: Dockerfile - environment: - - CatalogUrl=http://catalog.api - - OrderingUrl=http://ordering.api - #- IdentityUrl=http://104.40.62.65:5105 #Remote: VM Needs to have public access at 5105. - - IdentityUrl=http://identity.service:5105 #Local: You need a entry in windows host file to run identity in local docker. - - BasketUrl=http://basket.api - ports: - - "5104:80" - depends_on: - - basket.api - - identity.service - - identity.service: - image: eshop/identity - environment: - - SpaClient=http://localhost:5104 - - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word - #- MvcClient=http://104.40.62.65:5100 #Remote: VM Needs to have public access at 5105. - - MvcClient=http://localhost:5100 #Local: You need a entry in windows host file to run identity in local docker. - ports: - - "5105:5105" - depends_on: - - identity.data - - identity.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5433:1433" - - basket.api: - image: eshop/basket.api - environment: - - ConnectionString=basket.data - #- identityUrl=http://104.40.62.65:5105 #Remote: VM Needs to have public access at 5105. - - identityUrl=http://identity.service:5105 #Local: You need a entry in windows host file to run identity in local docker. - build: - context: . - dockerfile: Dockerfile - ports: - - "5103:5103" - depends_on: - - basket.data - - identity.service - - basket.data: - image: redis - - catalog.api: - image: eshop/catalog.api - environment: - - ConnectionString=Server=catalog.data;Database=CatalogDB;User Id=sa;Password=Pass@word - ports: - - "5101:80" - depends_on: - - catalog.data - - catalog.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5434:1433" - - ordering.api: - image: eshop/ordering.api - environment: - - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word - ports: - - "5102:80" - depends_on: - - ordering.data - - ordering.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5432:1433" diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj index 517b447f3..0479f6fe8 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj @@ -1,7 +1,7 @@ - + - netcoreapp1.0 + netcoreapp1.1 portable true eShopOnContainers.WebSPA @@ -10,6 +10,7 @@ aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119 1.1.0 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + ..\..\..\..\docker-compose.dcproj