Removing unused code and adding config to index

waldemarnt · waldemarnt · commit 74471aa2df5c · 2019-05-11T19:22:36.000+10:00
diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
@@ -4,6 +4,7 @@
       "url": "DATABASE_URL",
       "port": "DATABASE_PORT",
       "dbName": "DATABASE_NAME"
-    }
+    },
+    "port": "APP_PORT"
   }
 }
diff --git a/config/default.json b/config/default.json
@@ -1,9 +1,10 @@
 {
   "App": {
     "database": {
-      "url": "mongodb://mongodb",
+      "url": "mongodb://localhost",
       "port": 27017,
       "dbName": "development"
-    }
+    },
+    "port": 3000
   }
 }
diff --git a/config/environment.js b/config/environment.js
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -3,7 +3,7 @@ services:
   app:
     build: .
     environment:
-      NODE_ENV: development
+      NODE_ENV: docker
     command: node_modules/.bin/nodemon --exec npm start
     ports:
       - '3000:3000'
diff --git a/index.js b/index.js
@@ -1,9 +1,9 @@
 const log = require('./src/log');
 const { setupApp } = require('./src/app');
-const config = require('./config/environment');
+const config = require('config');
 
 setupApp()
-  .then(app => app.listen(config.port, () => log.info(`app running on port ${config.port}`)))
+  .then(app => app.listen(config.get('App.port'), () => log.info(`app running on port ${config.get('App.port')}`)))
   .catch(error => {
     log.error(error);
     process.exit(1); // eslint-disable-line
