Merge branch 'Robaum-0.4.0' into 0.4.0

meanjs · Jul 10, 2015 · 9e8ee9e · 9e8ee9e
2 parents cff3efe + 6bb5b8c
commit 9e8ee9e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM dockerfile/nodejs
+FROM node:0.10
 
 MAINTAINER Matthias Luebken, [email protected]
 
@@ -20,7 +20,7 @@ RUN bower install --config.interactive=false --allow-root
 # Make everything available for start
 ADD . /home/mean
 
-# currently only works for development
+# Set development environment as default
 ENV NODE_ENV development
 
 # Port 3000 for server

diff --git a/README.md b/README.md
@@ -101,12 +101,12 @@ $ grunt test:client
 
 ## Development and deployment With Docker
 
-* Install [Docker](http://www.docker.com/)
-* Install [Fig](https://github.com/orchardup/fig)
+* Install [Docker](https://docs.docker.com/installation/#installation)
+* Install [Compose](https://docs.docker.com/compose/install/)
 
-* Local development and testing with fig:
+* Local development and testing with 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
@@ -2,7 +2,7 @@
 
 module.exports = {
 	db: {
-		uri: 'mongodb://localhost/mean-test',
+		uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-test',
 		options: {
 			user: '',
 			pass: ''

diff --git a/config/env/test.js b/config/env/test.js
@@ -2,13 +2,13 @@
 
 module.exports = {
 	db: {
-		uri: 'mongodb://localhost/mean-test',
+		uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-test',
 		options: {
 			user: '',
 			pass: ''
 		}
 	},
-	port: 3001,
+	port: process.env.PORT || 3001,
 	app: {
 		title: 'MEAN.JS - Test Environment'
 	},

diff --git a/fig.yml → docker-compose.yml b/fig.yml → docker-compose.yml