From 4597b0336cca7f8e3332490c5d55f492fcb695d2 Mon Sep 17 00:00:00 2001
From: BillWagner <bill.w.wagner@outlook.com>
Date: Thu, 13 Apr 2017 09:47:10 -0400
Subject: [PATCH] Revert "catalog loads in Docker"

This reverts commit c160af2179004a544dab47f95fce8f1c895aecdb.
---
 .../Catalog.WebForms/docker-compose.override.yml | 16 ++++++++++++++++
 .../Catalog.WebForms/docker-compose.vs.debug.yml | 13 +++++++++++++
 src/Web/Catalog.WebForms/docker-compose.yml      | 13 ++++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/Web/Catalog.WebForms/docker-compose.override.yml b/src/Web/Catalog.WebForms/docker-compose.override.yml
index 8f30bad88..dc74370aa 100644
--- a/src/Web/Catalog.WebForms/docker-compose.override.yml
+++ b/src/Web/Catalog.WebForms/docker-compose.override.yml
@@ -1,6 +1,22 @@
 version: '2.1'
 
 services:
+  sql.data:
+    environment:
+      - SA_PASSWORD=Pass@word
+      - ACCEPT_EULA=Y
+    ports:
+      - "5433:1433"
+
+  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://localhost:5101    #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105.
+    ports:
+      - "5101:5101"
+
   catalog.webforms:
     ports:
       - "80:80"
diff --git a/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml b/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml
index 07dce6af4..b93037737 100644
--- a/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml
+++ b/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml
@@ -11,3 +11,16 @@ services:
       - ~\msvsmon:C:\msvsmon:ro
     labels:
       - "com.microsoft.visualstudio.targetoperatingsystem=windows"
+
+  catalog.api:
+    image: eshop/catalog.api:dev
+    build:
+      args:
+        source: ${DOCKER_BUILD_SOURCE}
+    environment:
+      - DOTNET_USE_POLLING_FILE_WATCHER=1
+    volumes:
+      - ../../Services/Catalog/Catalog.API:C:\app
+      - ~\msvsmon:C:\msvsmon:ro
+    labels:
+      - "com.microsoft.visualstudio.targetoperatingsystem=windows"
diff --git a/src/Web/Catalog.WebForms/docker-compose.yml b/src/Web/Catalog.WebForms/docker-compose.yml
index bcfeaa5e5..99cbd7914 100644
--- a/src/Web/Catalog.WebForms/docker-compose.yml
+++ b/src/Web/Catalog.WebForms/docker-compose.yml
@@ -6,5 +6,16 @@ services:
     build:
       context: .\Catalog.WebForms
       dockerfile: Dockerfile
+    depends_on:
+      - catalog.api
 
-  
\ No newline at end of file
+  catalog.api:
+    image: eshop/catalog.api
+    build:
+      context: ../../Services/Catalog/Catalog.API
+      dockerfile: Dockerfile.nanowin
+    depends_on:
+      - sql.data
+
+  sql.data:
+    image: microsoft/mssql-server-windows