From bf387354e047c986530eeaca142d090c74285d4a Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Mon, 29 Jul 2019 22:09:15 +0800
Subject: [PATCH] added mongodb username / password support

---
 backend/database/mongo.go | 10 +++++++++-
 docker-compose.yml        | 17 +++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/backend/database/mongo.go b/backend/database/mongo.go
index ecf3ba22..d1771c1d 100644
--- a/backend/database/mongo.go
+++ b/backend/database/mongo.go
@@ -33,9 +33,17 @@ func InitMongo() error {
 	var mongoHost = viper.GetString("mongo.host")
 	var mongoPort = viper.GetString("mongo.port")
 	var mongoDb = viper.GetString("mongo.db")
+	var mongoUsername = viper.GetString("mongo.username")
+	var mongoPassword = viper.GetString("mongo.password")
 
 	if Session == nil {
-		sess, err := mgo.Dial("mongodb://" + mongoHost + ":" + mongoPort + "/" + mongoDb)
+		var uri string
+		if mongoUsername == "" {
+			uri = "mongodb://" + mongoHost + ":" + mongoPort + "/" + mongoDb
+		} else {
+			uri = "mongodb://" + mongoUsername + ":" + mongoPassword + "@" + mongoHost + ":" + mongoPort + "/" + mongoDb
+		}
+		sess, err := mgo.Dial(uri)
 		if err != nil {
 			return err
 		}
diff --git a/docker-compose.yml b/docker-compose.yml
index 682f404b..15ff8338 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,19 +3,16 @@ services:
   master: 
     image: tikazyq/crawlab:latest
     container_name: crawlab
-    volumes:
-      - /home/yeqing/config.py:/opt/crawlab/crawlab/config/config.py # 后端配置文件
-      - /home/yeqing/.env.production:/opt/crawlab/frontend/.env.production # 前端配置文件
+    environment:
+      CRAWLAB_SERVER_MASTER: "Y"
+      CRAWLAB_MONGO_HOST: "mongo"
+      CRAWLAB_REDIS_ADDRESS: "redis:6379"
     ports:    
-      - "8080:8080" # nginx
-      - "8000:8000" # app
+      - "8080:8080" # frontend
+      - "8000:8000" # backend
     depends_on:
       - mongo
       - redis
-    entrypoint:
-      - /bin/sh
-      - /opt/crawlab/docker_init.sh
-      - master
   mongo:
     image: mongo:latest
     restart: always
@@ -25,4 +22,4 @@ services:
     image: redis:latest
     restart: always
     ports:
-      - "6379:6379"
+      - "6379:6379"
\ No newline at end of file