From f1df74859a484136de49f8b24450f84ccaf90508 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Fri, 1 Nov 2019 13:10:46 +0800 Subject: [PATCH] updated Jenkinsfile --- Jenkinsfile | 14 +------------- docker-compose.yml | 4 ++++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b7441bea..24cc31c5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,15 +16,6 @@ pipeline { } else if (env.GIT_BRANCH == 'master') { env.TAG = 'master' env.DOCKERFILE = 'Dockerfile.local' - } else if (env.GIT_BRANCH == 'frontend') { - env.TAG = 'frontend-alpine' - env.DOCKERFILE = 'docker/Dockerfile.frontend.alpine' - } else if (env.GIT_BRANCH == 'backend-master') { - env.TAG = 'master-alpine' - env.DOCKERFILE = 'docker/Dockerfile.master.alpine' - } else if (env.GIT_BRANCH == 'backend-worker') { - env.TAG = 'worker-alpine' - env.DOCKERFILE = 'docker/Dockerfile.worker.alpine' } } } @@ -48,10 +39,7 @@ pipeline { sh """ # 重启docker compose cd ./jenkins/${ENV:GIT_BRANCH} - docker-compose stop master | true - docker-compose rm -f master | true - docker-compose stop worker | true - docker-compose rm -f worker | true + docker-compose down | true docker-compose up -d | true """ } diff --git a/docker-compose.yml b/docker-compose.yml index d44d5024..0be1f13a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,10 +27,14 @@ services: mongo: image: mongo:latest restart: always + volumes: + - "/opt/crawlab/mongo/data/db:/data/db" ports: - "27017:27017" redis: image: redis:latest restart: always + volumes: + - "/opt/crawlab/redis/data:/data" ports: - "6379:6379" \ No newline at end of file