From 52ef690ed14c34545b999b4490625a9bf500e03f Mon Sep 17 00:00:00 2001
From: Kyle Bowerman <kyle.bowerman@appirio.com>
Date: Tue, 24 Mar 2015 16:36:58 -0500
Subject: [PATCH] removed reference of fig and replaced #449 with
 docker-compose and changed the cofnig file to look at a env var which is set
 from the yaml file

---
 README.md                     | 6 +++---
 config/env/development.js     | 2 +-
 fig.yml => docker-compose.yml | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename fig.yml => docker-compose.yml (62%)

diff --git a/README.md b/README.md
index 4b1a5accbe..a6c2182a6e 100644
--- a/README.md
+++ b/README.md
@@ -102,11 +102,11 @@ $ grunt test:client
 ## Development and deployment With Docker
 
 * Install [Docker](http://www.docker.com/)
-* Install [Fig](https://github.com/orchardup/fig)
+* Install [docker-copose](http://docs.docker.com/compose/)
 
-* Local development and testing with fig:
+* Local development and testing with docker-compose:
 ```bash
-$ fig up
+$ docker-compose up
 ```
 
 * Local development and testing with just Docker:
diff --git a/config/env/development.js b/config/env/development.js
index 35c08b7e8e..f8f97a2544 100644
--- a/config/env/development.js
+++ b/config/env/development.js
@@ -2,7 +2,7 @@
 
 module.exports = {
 	db: {
-		uri: 'mongodb://localhost/mean-dev',
+		uri: process.env.DOCKER_MONG_URL || 'mongodb://localhost/mean-dev',
 		options: {
 			user: '',
 			pass: ''
diff --git a/fig.yml b/docker-compose.yml
similarity index 62%
rename from fig.yml
rename to docker-compose.yml
index 967ac7d1d1..40d1bef2b0 100644
--- a/fig.yml
+++ b/docker-compose.yml
@@ -4,9 +4,10 @@ web:
    - db
   ports:
    - "3000:3000"
-  environment: 
+  environment:
    NODE_ENV: development
+   DOCKER_MONG_URL: mongodb://mean_db_1/mean-dev
 db:
   image: mongo
-  ports: 
+  ports:
    - "27017:27017"