Merge branch 'compose-reorg' into dev

Author: eiximenis

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
+    

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: eshop/basket.api
     build:
       context: ./src/Services/Basket/Basket.API
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile    
     depends_on:
       - basket.data
       - identity.api
@@ -15,7 +15,7 @@ services:
     image: eshop/catalog.api
     build:
       context: ./src/Services/Catalog/Catalog.API
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile    
     depends_on:
       - sql.data
       - rabbitmq
@@ -24,23 +24,23 @@ services:
     image: eshop/identity.api
     build:
       context: ./src/Services/Identity/Identity.API
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile    
     depends_on:
       - sql.data
 
   ordering.api:
     image: eshop/ordering.api
     build:
       context: ./src/Services/Ordering/Ordering.API
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile    
     depends_on:
       - sql.data
 
   webspa:
     image: eshop/webspa
     build:
       context: ./src/Web/WebSPA
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile    
     depends_on:
       - identity.api
       - basket.api
@@ -49,7 +49,7 @@ services:
     image: eshop/webmvc
     build:
       context: ./src/Web/WebMVC
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile    
     depends_on:
       - catalog.api
       - ordering.api
@@ -73,4 +73,5 @@ services:
     image: eshop/webstatus
     build:
       context: ./src/Web/WebStatus
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile    
+