updated Jenkinsfile

This commit is contained in:
Marvin Zhang
2019-08-07 12:02:33 +08:00
parent 7f0b47d7e4
commit d5bb59c1b6
3 changed files with 13 additions and 11 deletions

4
Jenkinsfile vendored
View File

@@ -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 .
"""
}
}

View File

@@ -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"
- "6389:6379"

View File

@@ -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"