git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-22 17:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #292 from crawlab-team/develop

Browse Source 
Develop
This commit is contained in:
Marvin Zhang
2019-11-01 13:12:14 +08:00
committed by GitHub
parent b39e6574db fb08ccdacf
commit a391dda1a8
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Jenkinsfile vendored
View File

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

4
docker-compose.yml
View File

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