OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-05-01 13:48:56 +08:00
Code Issues Projects Releases Wiki Activity

Make app port more configurable

Browse Source 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
This commit is contained in:
Drasko DRASKOVIC 2016-04-20 20:58:41 +02:00
parent 00c6cb77c6
commit bb0ead885f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -6,6 +6,8 @@
FROM node:4.2.3 FROM node:4.2.3
MAINTAINER Mainflux MAINTAINER Mainflux
ENV MAINFLUX_PORT=7070
RUN apt-get update -qq && apt-get install -y build-essential RUN apt-get update -qq && apt-get install -y build-essential
RUN mkdir /mainflux RUN mkdir /mainflux
@ -23,7 +25,7 @@ COPY . /mainflux
WORKDIR /mainflux WORKDIR /mainflux
RUN npm install RUN npm install
EXPOSE 8080 EXPOSE $MAINFLUX_PORT
### ###
# Run main command from entrypoint and parameters in CMD[] # Run main command from entrypoint and parameters in CMD[]

2
app/database.js
View File

@ -11,7 +11,7 @@ var collections = ['devices'];
/** Check if we run with Docker compose */ /** Check if we run with Docker compose */
var dockerMongo = process.env.MONGODB_NAME; var dockerMongo = process.env.MONGODB_NAME;
var dbUrl = ''; 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; dbUrl = 'mongodb://' + process.env.MONGODB_PORT_27017_TCP_ADDR + ':' + process.env.MONGODB_PORT_27017_TCP_PORT + '/' + config.db.name;
} else { } else {
dbUrl = 'mongodb://' + config.db.addr + ':' + config.db.port + '/' + config.db.name; dbUrl = 'mongodb://' + config.db.addr + ':' + config.db.port + '/' + config.db.name;

2
config/development.json
View File

@ -5,7 +5,7 @@
"port" : "27017", "port" : "27017",
"name" : "test" "name" : "test"
}, },
"port" : "8080", "port" : "7070",
"tokenSecret": "Pariz-Beograd", "tokenSecret": "Pariz-Beograd",
"userTokenExpirePeriod": "10080", "userTokenExpirePeriod": "10080",
"limiter" : { "limiter" : {