OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-05-04 22:17:59 +08:00
Code Issues Projects Releases Wiki Activity

Correct Docker files

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

6
Dockerfile
View File

@ -8,7 +8,7 @@ MAINTAINER Mainflux
RUN apt-get update -qq && apt-get install -y build-essential RUN apt-get update -qq && apt-get install -y build-essential
RUN mkdir /src RUN mkdir /mainflux
### ###
# Installations # Installations
@ -19,8 +19,8 @@ RUN npm install -g gulp
RUN npm install -g nodemon RUN npm install -g nodemon
# Finally, install all project Node modules # Finally, install all project Node modules
WORKDIR /src COPY . /mainflux
ADD package.json /src/package.json WORKDIR /mainflux
RUN npm install RUN npm install
EXPOSE 8080 EXPOSE 8080

51
docker-compose.yml
View File

@ -1,16 +1,39 @@
api: ###
build: . # Copyright (c) Mainflux
volumes: #
- ".:/src" # Mainflux server is licensed under an Apache license, version 2.0 license.
ports: # All rights not explicitly granted in the Apache license, version 2.0 are reserved.
- "8080:8080" # See the included LICENSE file for more details.
# set up links so that api knows about db, redis, etc... ###
links:
- mongodb
container_name: mainflux-api-docker
mongodb: ###
image: mongo # MongoDB
###
mongo:
image: mongo:3.2
container_name: mainflux-mongodb
command: --smallfiles --nojournal
###
# NATS
###
nats:
image: apcera/gnatsd:latest
container_name: mainflux-nats
ports: ports:
- "27017:27017" - "4222:4222"
container_name: mainflux-mongo-docker - "8333:8333"
###
# Mainflux
###
mainflux:
image: mainflux/mainflux-lite:latest
container_name: mainflux-api
volumes:
- ./config:/mainflux/config
links:
- mongo
- nats
ports:
- "8080:8080"

2
server.js
View File

@ -19,7 +19,7 @@ var mongoose = require('mongoose');
/** 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;