From 9d42f6a3b78fb6c3d47300d8fbd1920c7af83d7d Mon Sep 17 00:00:00 2001
From: Eduard Tomas <etomas@gmail.com>
Date: Fri, 19 May 2017 19:32:42 +0200
Subject: [PATCH] New docker compose files

---
 docker-compose.build.yml   | 37 -------------------------
 docker-compose.nobuild.yml | 56 ++++++++++++++++++++++++++++++++++++++
 docker-compose.yml         | 21 ++++++++++++++
 3 files changed, 77 insertions(+), 37 deletions(-)
 delete mode 100644 docker-compose.build.yml
 create mode 100644 docker-compose.nobuild.yml

diff --git a/docker-compose.build.yml b/docker-compose.build.yml
deleted file mode 100644
index ccfe08b3b..000000000
--- a/docker-compose.build.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: '2'
-
-services:
-  basket.api:
-    build:
-      context: ./src/Services/Basket/Basket.API
-      dockerfile: Dockerfile
-
-  catalog.api:
-    build:
-      context: ./src/Services/Catalog/Catalog.API
-      dockerfile: Dockerfile
-
-  identity.api:
-    build:
-      context: ./src/Services/Identity/Identity.API
-      dockerfile: Dockerfile
-
-  ordering.api:
-    build:
-      context: ./src/Services/Ordering/Ordering.API
-      dockerfile: Dockerfile
-
-  webspa:
-    build:
-      context: ./src/Web/WebSPA
-      dockerfile: Dockerfile
-
-  webmvc:
-    build:
-      context: ./src/Web/WebMVC
-      dockerfile: Dockerfile
-
-  webstatus:
-    build:
-      context: ./src/Web/WebStatus
-      dockerfile: Dockerfile
diff --git a/docker-compose.nobuild.yml b/docker-compose.nobuild.yml
new file mode 100644
index 000000000..f74aa9c14
--- /dev/null
+++ b/docker-compose.nobuild.yml
@@ -0,0 +1,56 @@
+version: '2'
+
+services:
+  basket.api:
+    image: eshop/basket.api
+    depends_on:
+      - basket.data
+      - identity.api
+      - rabbitmq
+
+  catalog.api:
+    image: eshop/catalog.api
+    depends_on:
+      - sql.data
+      - rabbitmq
+
+  identity.api:
+    image: eshop/identity.api
+    depends_on:
+      - sql.data
+
+  ordering.api:
+    image: eshop/ordering.api
+    depends_on:
+      - sql.data
+
+  webspa:
+    image: eshop/webspa
+    depends_on:
+      - identity.api
+      - basket.api
+
+  webmvc:
+    image: eshop/webmvc  
+    depends_on:
+      - catalog.api
+      - ordering.api
+      - identity.api
+      - basket.api
+
+  sql.data:
+    image: microsoft/mssql-server-linux
+
+  basket.data:
+    image: redis
+    ports:
+      - "6379:6379"
+
+  rabbitmq:
+    image: rabbitmq
+    ports:
+      - "5672:5672"
+
+  webstatus:
+    image: eshop/webstatus
+    
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 414680acd..21f3972f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,9 @@ version: '2'
 services:
   basket.api:
     image: eshop/basket.api
+    build:
+      context: ./src/Services/Basket/Basket.API
+      dockerfile: Dockerfile    
     depends_on:
       - basket.data
       - identity.api
@@ -10,28 +13,43 @@ services:
 
   catalog.api:
     image: eshop/catalog.api
+    build:
+      context: ./src/Services/Catalog/Catalog.API
+      dockerfile: Dockerfile    
     depends_on:
       - sql.data
       - rabbitmq
 
   identity.api:
     image: eshop/identity.api
+    build:
+      context: ./src/Services/Identity/Identity.API
+      dockerfile: Dockerfile    
     depends_on:
       - sql.data
 
   ordering.api:
     image: eshop/ordering.api
+    build:
+      context: ./src/Services/Ordering/Ordering.API
+      dockerfile: Dockerfile    
     depends_on:
       - sql.data
 
   webspa:
     image: eshop/webspa
+    build:
+      context: ./src/Web/WebSPA
+      dockerfile: Dockerfile    
     depends_on:
       - identity.api
       - basket.api
 
   webmvc:
     image: eshop/webmvc
+    build:
+      context: ./src/Web/WebMVC
+      dockerfile: Dockerfile    
     depends_on:
       - catalog.api
       - ordering.api
@@ -53,4 +71,7 @@ services:
 
   webstatus:
     image: eshop/webstatus
+    build:
+      context: ./src/Web/WebStatus
+      dockerfile: Dockerfile    
     
\ No newline at end of file