From 3c063062a5216875401ca3c0b5fd5b91f53ecab1 Mon Sep 17 00:00:00 2001
From: Sam <sam@lalop.co>
Date: Sun, 24 Apr 2016 22:29:11 +0300
Subject: [PATCH 1/2] link db from web container

---
 docker-compose.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2aa0d8e2..c2795c58 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,9 +3,9 @@ version: '2'
 services:
   db:
     image: mongo:3.2
-    command: ['bash', '-c', 'mongod --storageEngine wiredTiger'] #['mongod', '--storageEngine', 'wiredTiger']
+#    command: ['bash', '-c', 'mongod --storageEngine wiredTiger'] #['mongod', '--storageEngine', 'wiredTiger']
     volumes:
-    - mongo-data-wt:/data/db
+    - ./mongo-data-wt:/data/db
     #- /tmp/etc:/etc
     networks:
       - back-tier
@@ -19,6 +19,8 @@ services:
       - "35729:35729"
     networks:
       - back-tier
+    links:
+      - db
 volumes:
   mongo-data-wt:
     driver: local

From d0ca8bdb62985c421fe07f2364e54eec1ee26279 Mon Sep 17 00:00:00 2001
From: Sam <sam@lalop.co>
Date: Mon, 25 Apr 2016 14:22:54 +0300
Subject: [PATCH 2/2] fix docker-compose for dev #60

---
 Dockerfile         |  2 +-
 docker-compose.yml | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 198339fd..5639a74d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,4 +13,4 @@ ENV NODE_ENV development
 # Port 3000 for server
 # Port 35729 for livereload
 EXPOSE 3000 35729
-CMD ["grunt default"]
+CMD ["grunt"]
diff --git a/docker-compose.yml b/docker-compose.yml
index c2795c58..56d4a488 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,27 +3,20 @@ version: '2'
 services:
   db:
     image: mongo:3.2
-#    command: ['bash', '-c', 'mongod --storageEngine wiredTiger'] #['mongod', '--storageEngine', 'wiredTiger']
     volumes:
-    - ./mongo-data-wt:/data/db
-    #- /tmp/etc:/etc
-    networks:
-      - back-tier
+      - mongo-data-wt:/data/db
   web:
-    build:
-      context: .
+    build: .
     volumes:
       - .:/usr/src/app
     ports:
       - "3000:3000"
       - "35729:35729"
-    networks:
-      - back-tier
+    environment:
+      DB_1_PORT_27017_TCP_ADDR: db
+      PORT: 3000
     links:
       - db
 volumes:
   mongo-data-wt:
     driver: local
-networks:
-  back-tier:
-    driver: bridge