From 682a64d7517bfbbfbb47b75dc3b3b387937e50a4 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Wed, 31 Jul 2019 19:38:03 +0800
Subject: [PATCH] updated Jenkinsfile

---
 Jenkinsfile        |  3 ++-
 README-zh.md       | 18 ++++++++++++++----
 docker-compose.yml | 12 +++++-------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4e3f86cb..64d123f8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
                 echo "Running Setup..."
                 script {
                     if (env.GIT_BRANCH == 'develop') {
-                        env.MODE = 'test'
+                        env.MODE = 'develop'
                     } else if (env.GIT_BRANCH == 'master') {
                         env.MODE = 'production'
                     } else {
@@ -37,6 +37,7 @@ pipeline {
             steps {
                 echo 'Deploying....'
                 sh """
+                cd ./jenkins
                 docker-compose stop | true
                 docker-compose up -d
                 """
diff --git a/README-zh.md b/README-zh.md
index 0b4d9849..49877554 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -50,25 +50,35 @@ docker run -d --rm --name crawlab \
         tikazyq/crawlab:0.3.0
 ```
 
-当然也可以用`docker-compose`来一键启动，甚至不用配置MongoDB和Redis数据库。在当前目录中创建`docker-compose.yml`文件，输入以下内容。
+当然也可以用`docker-compose`来一键启动，甚至不用配置MongoDB和Redis数据库，**当然我们推荐这样做**。在当前目录中创建`docker-compose.yml`文件，输入以下内容。
 
 ```bash
 version: '3.3'
 services:
   master: 
     image: tikazyq/crawlab:latest
-    container_name: crawlab-master
+    container_name: master
     environment:
-      CRAWLAB_API_ADDRESS: "192.168.99.100:8000"
+      CRAWLAB_API_ADDRESS: "localhost:8000"
       CRAWLAB_SERVER_MASTER: "Y"
       CRAWLAB_MONGO_HOST: "mongo"
-      CRAWLAB_REDIS_ADDRESS: "redis:6379"
+      CRAWLAB_REDIS_ADDRESS: "redis"
     ports:    
       - "8080:8080" # frontend
       - "8000:8000" # backend
     depends_on:
       - mongo
       - redis
+  worker:
+    image: tikazyq/crawlab:latest
+    container_name: worker
+    environment:
+      CRAWLAB_SERVER_MASTER: "N"
+      CRAWLAB_MONGO_HOST: "mongo"
+      CRAWLAB_REDIS_ADDRESS: "redis"
+    depends_on:
+      - mongo
+      - redis
   mongo:
     image: mongo:latest
     restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index 536b7d6b..d44d5024 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,14 +2,12 @@ version: '3.3'
 services:
   master: 
     image: tikazyq/crawlab:latest
-    container_name: crawlab-master
+    container_name: master
     environment:
-      CRAWLAB_API_ADDRESS: "192.168.99.100:8000"
+      CRAWLAB_API_ADDRESS: "localhost:8000"
       CRAWLAB_SERVER_MASTER: "Y"
       CRAWLAB_MONGO_HOST: "mongo"
-      CRAWLAB_REDIS_ADDRESS: "redis:6379"
-    networks:
-      - host
+      CRAWLAB_REDIS_ADDRESS: "redis"
     ports:    
       - "8080:8080" # frontend
       - "8000:8000" # backend
@@ -18,11 +16,11 @@ services:
       - redis
   worker:
     image: tikazyq/crawlab:latest
-    container_name: crawlab-worker
+    container_name: worker
     environment:
       CRAWLAB_SERVER_MASTER: "N"
       CRAWLAB_MONGO_HOST: "mongo"
-      CRAWLAB_REDIS_ADDRESS: "redis:6379"
+      CRAWLAB_REDIS_ADDRESS: "redis"
     depends_on:
       - mongo
       - redis