From b374518b1146aad9816faad0e5aebe0fa54a475c Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Mon, 5 Aug 2019 20:13:47 +0800 Subject: [PATCH] split envs --- Jenkinsfile | 5 ++- jenkins/develop/docker-compose.yaml | 36 +++++++++++++++++++ .../docker-compose.yaml} | 0 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 jenkins/develop/docker-compose.yaml rename jenkins/{docker-compose.yml => master/docker-compose.yaml} (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 5490949a..7ceef1c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,10 @@ pipeline { steps { echo 'Deploying....' sh """ - cd ./jenkins + echo ${ENV:GIT_BRANCH} + """ + sh """ + cd ./jenkins/${ENV:GIT_BRANCH} docker-compose stop | true docker-compose up -d --scale worker=3 """ diff --git a/jenkins/develop/docker-compose.yaml b/jenkins/develop/docker-compose.yaml new file mode 100644 index 00000000..1a82e4d4 --- /dev/null +++ b/jenkins/develop/docker-compose.yaml @@ -0,0 +1,36 @@ +version: '3.3' +services: + master: + image: tikazyq/crawlab:latest + container_name: master + environment: + 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: + - "8088:8080" # frontend + - "8008:8000" # backend + depends_on: + - mongo + - redis + worker: + image: tikazyq/crawlab:latest + environment: + CRAWLAB_SERVER_MASTER: "N" + CRAWLAB_MONGO_HOST: "mongo" + CRAWLAB_REDIS_ADDRESS: "redis" + depends_on: + - mongo + - redis + mongo: + image: mongo:latest + restart: always + ports: + - "27019:27017" + redis: + image: redis:latest + restart: always + ports: + - "6389:6379" \ No newline at end of file diff --git a/jenkins/docker-compose.yml b/jenkins/master/docker-compose.yaml similarity index 100% rename from jenkins/docker-compose.yml rename to jenkins/master/docker-compose.yaml