From d5bb59c1b6bc17be671f7425dde44f0771549921 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Wed, 7 Aug 2019 12:02:33 +0800
Subject: [PATCH] updated Jenkinsfile

---
 Jenkinsfile                         |  4 +++-
 jenkins/develop/docker-compose.yaml | 16 ++++++++--------
 jenkins/master/docker-compose.yaml  |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 30f3b99c..7a46844b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,9 +12,11 @@ pipeline {
                 script {
                     if (env.GIT_BRANCH == 'develop') {
                         env.MODE = 'develop'
+                        env.TAG = 'develop'
                         env.BASE_URL = '/dev'
                     } else if (env.GIT_BRANCH == 'master') {
                         env.MODE = 'production'
+                        env.TAG = 'master'
                         env.BASE_URL = '/demo'
                     } 
                 }
@@ -24,7 +26,7 @@ pipeline {
             steps {
                 echo "Building..."
                 sh """
-                docker build -t tikazyq/crawlab:latest -f Dockerfile.local .
+                docker build -t tikazyq/crawlab:${ENV:TAG} -f Dockerfile.local .
                 """
             }
         }
diff --git a/jenkins/develop/docker-compose.yaml b/jenkins/develop/docker-compose.yaml
index 2869da0e..cf466671 100644
--- a/jenkins/develop/docker-compose.yaml
+++ b/jenkins/develop/docker-compose.yaml
@@ -1,21 +1,21 @@
 version: '3.3'
 services:
   master: 
-    image: tikazyq/crawlab:latest
+    image: "tikazyq/crawlab:develop"
     environment:
-      CRAWLAB_API_ADDRESS: "crawlab.cn/api"
+      CRAWLAB_API_ADDRESS: "crawlab.cn/dev/api"
       CRAWLAB_SERVER_MASTER: "Y"
       CRAWLAB_MONGO_HOST: "mongo"
       CRAWLAB_REDIS_ADDRESS: "redis"
       CRAWLAB_LOG_PATH: "/var/logs/crawlab"
-    ports:    
-      - "8080:8080" # frontend
-      - "8000:8000" # backend
+    ports:
+      - "8090:8080" # frontend
+      - "8010:8000" # backend
     depends_on:
       - mongo
       - redis
   worker:
-    image: tikazyq/crawlab:latest
+    image: "tikazyq/crawlab:develop"
     environment:
       CRAWLAB_SERVER_MASTER: "N"
       CRAWLAB_MONGO_HOST: "mongo"
@@ -27,9 +27,9 @@ services:
     image: mongo:latest
     restart: always
     ports:
-      - "27017:27017"
+      - "27027:27017"
   redis:
     image: redis:latest
     restart: always
     ports:
-      - "6379:6379"
\ No newline at end of file
+      - "6389:6379"
\ No newline at end of file
diff --git a/jenkins/master/docker-compose.yaml b/jenkins/master/docker-compose.yaml
index 2869da0e..0bcaee3a 100644
--- a/jenkins/master/docker-compose.yaml
+++ b/jenkins/master/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   master: 
-    image: tikazyq/crawlab:latest
+    image: "tikazyq/crawlab:master"
     environment:
       CRAWLAB_API_ADDRESS: "crawlab.cn/api"
       CRAWLAB_SERVER_MASTER: "Y"
@@ -15,7 +15,7 @@ services:
       - mongo
       - redis
   worker:
-    image: tikazyq/crawlab:latest
+    image: "tikazyq/crawlab:master"
     environment:
       CRAWLAB_SERVER_MASTER: "N"
       CRAWLAB_MONGO_HOST: "mongo"