From bb0ead885f121ca425daf6556cb3ccea4410bebf Mon Sep 17 00:00:00 2001
From: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
Date: Wed, 20 Apr 2016 20:58:41 +0200
Subject: [PATCH] Make app port more configurable

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
---
 Dockerfile              | 4 +++-
 app/database.js         | 2 +-
 config/development.json | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9e694e0c..2f5f163a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,8 @@
 FROM node:4.2.3
 MAINTAINER Mainflux
 
+ENV MAINFLUX_PORT=7070
+
 RUN apt-get update -qq && apt-get install -y build-essential
 
 RUN mkdir /mainflux
@@ -23,7 +25,7 @@ COPY . /mainflux
 WORKDIR /mainflux
 RUN npm install
 
-EXPOSE 8080
+EXPOSE $MAINFLUX_PORT
 
 ###
 # Run main command from entrypoint and parameters in CMD[]
diff --git a/app/database.js b/app/database.js
index 2f9ea709..afe8691c 100644
--- a/app/database.js
+++ b/app/database.js
@@ -11,7 +11,7 @@ var collections = ['devices'];
 /** Check if we run with Docker compose */
 var dockerMongo = process.env.MONGODB_NAME;
 var dbUrl = '';
-if (dockerMongo && dockerMongo == '/mainflux-api-docker/mongodb') {
+if (dockerMongo && dockerMongo == '/mainflux-api/mongodb') {
     dbUrl = 'mongodb://' + process.env.MONGODB_PORT_27017_TCP_ADDR + ':' + process.env.MONGODB_PORT_27017_TCP_PORT + '/' + config.db.name;
 } else {
     dbUrl = 'mongodb://' + config.db.addr + ':' + config.db.port + '/' + config.db.name;
diff --git a/config/development.json b/config/development.json
index 8da0a6f7..4b8413c4 100644
--- a/config/development.json
+++ b/config/development.json
@@ -5,7 +5,7 @@
         "port" : "27017",
         "name" : "test"
     },
-    "port" : "8080",
+    "port" : "7070",
     "tokenSecret": "Pariz-Beograd",
     "userTokenExpirePeriod": "10080",
     "limiter" : {