Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnC…

…ontainers into dev (#103) # Conflicts: # .dockerignore # README.md # docker-compose-windows.yml # docker-compose.override.windows.yml # docker-compose.override.yml # docker-compose.yml # eShopOnContainers-ServicesAndWebApps.sln # global.json # k8s/services.yaml # src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json # src/BuildingBlocks/Resilience/Resilience.Http/IHttpClient.cs # src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs # src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs # src/Services/Basket/Basket.API/Basket.API.csproj # src/Services/Basket/Basket.API/Dockerfile # src/Services/Catalog/Catalog.API/Catalog.API.csproj # src/Services/Catalog/Catalog.API/Dockerfile # src/Services/Catalog/Catalog.API/Startup.cs # src/Services/Identity/Identity.API/Configuration/Config.cs # src/Services/Identity/Identity.API/Dockerfile # src/Services/Identity/Identity.API/Identity.API.csproj # src/Services/Location/Locations.API/Locations.API.csproj # src/Services/Marketing/Marketing.API/Marketing.API.csproj # src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderCancelled/OrderCancelledDomainEventHandler.cs # src/Services/Ordering/Ordering.API/Dockerfile # src/Services/Ordering/Ordering.API/Ordering.API.csproj # src/Services/Ordering/Ordering.API/Startup.cs # src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile # src/Services/Ordering/Ordering.SignalrHub/Dockerfile # src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs # src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj # src/Services/Ordering/Ordering.SignalrHub/Startup.cs # src/Services/Payment/Payment.API/Payment.API.csproj # src/Web/WebMVC/AppSettings.cs # src/Web/WebMVC/Dockerfile # src/Web/WebMVC/Services/OrderingService.cs # src/Web/WebMVC/Startup.cs # src/Web/WebMVC/WebMVC.csproj # src/Web/WebSPA/WebSPA.csproj # src/Web/WebSPA/package-lock.json # src/Web/WebStatus/WebStatus.csproj
dotnet-architecture · Jun 16, 2018 · c5e993a · c5e993a
1 parent 181bc7f
commit c5e993a
Show file tree

Hide file tree

Showing 165 changed files with 9,853 additions and 13,210 deletions.
diff --git a/cli-windows/start-windows-containers.ps1 b/cli-windows/start-windows-containers.ps1
@@ -25,8 +25,8 @@ $env:ESHOP_AZURE_STORAGE_CATALOG_URL ="http://10.0.75.1:5101/api/v1/catalog/item
 $env:ESHOP_AZURE_STORAGE_MARKETING_URL ="http://10.0.75.1:5110/api/v1/campaigns/[0]/pic/"
 
 if (-Not $customEventBusLoginPassword) {
-    docker-compose -f "$rootPath\docker-compose-windows.yml" -f "$rootPath\docker-compose.override.yml" -f "$rootPath\docker-compose.override.windows.yml" up
+    docker-compose -f "$rootPath\docker-compose.yml" -f "$rootPath\docker-compose.override.yml" -f "$rootPath\docker-compose.windows.yml" -f "$rootPath\docker-compose.override.windows.yml" up
 }
 else {
-    docker-compose -f "$rootPath\docker-compose-windows.yml" -f "$rootPath\docker-compose.override.yml"  up
+    docker-compose -f "$rootPath\docker-compose.yml" -f "$rootPath\docker-compose.override.yml" -f "$rootPath\docker-compose.windows.yml"   up
 }
diff --git a/docker-compose.override.windows.yml b/docker-compose.override.windows.yml
@@ -37,11 +37,6 @@ services:
       - EventBusUserName=admin
       - EventBusPassword=password
 
-  ordering.api:
-    environment:
-      - EventBusUserName=admin
-      - EventBusPassword=password
-
   ordering.backgroundtasks:
     environment:
       - EventBusUserName=admin
@@ -58,6 +53,6 @@ services:
       - EventBusPassword=password
 
   ordering.signalrhub:
-  environment:
+    environment:
       - EventBusUserName=admin
-      - EventBusPassword=password
+      - EventBusPassword=password
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -136,7 +136,6 @@ services:
       UseCustomizationDataAI: "True"
       AzureServiceBusEnabled: "False"
       CheckUpdateTime: 30000
-      GracePeriodTime: 1
       ApplicationInsights__InstrumentationKey: ${INSTRUMENTATION_KEY}
       OrchestratorType: ${ORCHESTRATOR_TYPE}
       UseLoadTest: ${USE_LOADTEST:-False}
@@ -290,16 +289,15 @@ services:
     ports:
       - "5200:80"   
     volumes:
-      - ./src/ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
-
+      - ./src/ApiGateways/Mobile.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
   mobilemarketingapigw:
     environment:
       ASPNETCORE_ENVIRONMENT: "Development"
       IdentityUrl: http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
     ports:
       - "5201:80"   
     volumes:
-      - ./src/ApiGateways/Mobile.Bff.Marketing/apigw:/app/configuration
+      - ./src/ApiGateways/Mobile.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
 
   webshoppingapigw:
     environment:
@@ -308,7 +306,7 @@ services:
     ports:
       - "5202:80"   
     volumes:
-      - ./src/ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
+      - ./src/ApiGateways/Web.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
 
   webmarketingapigw:
     environment:
@@ -317,7 +315,7 @@ services:
     ports:
       - "5203:80"   
     volumes:
-      - ./src/ApiGateways/Web.Bff.Marketing/apigw:/app/configuration
+      - ./src/ApiGateways/Web.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
 
   mobileshoppingagg:
     environment:

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -85,7 +85,6 @@ services:
       - UseCustomizationData=True
       - AzureServiceBusEnabled=False
       - CheckUpdateTime=30000
-      - GracePeriodTime=1
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
       - UseLoadTest=${USE_LOADTEST:-False}

diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
@@ -0,0 +1,39 @@
+# This file contains specific services build and images for Windows Containers.
+#
+# MUST be used alongside "docker-compose.yml" in all windows container commands
+
+version: '3.4'
+
+services:
+  identity.api:
+    build:
+      args:
+        NODE_IMAGE: stefanscherer/node-windows:8.11
+
+  webmvc:
+    build:
+      args:
+        NODE_IMAGE: stefanscherer/node-windows:8.11
+
+  webspa:
+    build:
+      args:
+        NODE_IMAGE: stefanscherer/node-windows:8.11
+
+  sql.data:
+    image: microsoft/mssql-server-windows-developer
+
+  nosql.data:
+    image: mongo:windowsservercore
+
+  basket.data:
+    image: redis:nanoserver
+
+  rabbitmq:
+    image: spring2/rabbitmq
+
+
+networks:
+  default:
+    external:
+      name: nat