diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..dd84ea78 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..bbcbbe7d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. 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/README-zh.md b/README-zh.md index b4e2b469..a12eacc4 100644 --- a/README-zh.md +++ b/README-zh.md @@ -47,7 +47,7 @@ services: image: tikazyq/crawlab:latest container_name: master environment: - CRAWLAB_API_ADDRESS: "localhost:8000" + CRAWLAB_API_ADDRESS: "http://localhost:8000" CRAWLAB_SERVER_MASTER: "Y" CRAWLAB_MONGO_HOST: "mongo" CRAWLAB_REDIS_ADDRESS: "redis" diff --git a/README.md b/README.md index 91a30b34..70822b1d 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ services: image: tikazyq/crawlab:latest container_name: master environment: - CRAWLAB_API_ADDRESS: "localhost:8000" + CRAWLAB_API_ADDRESS: "http://localhost:8000" CRAWLAB_SERVER_MASTER: "Y" CRAWLAB_MONGO_HOST: "mongo" CRAWLAB_REDIS_ADDRESS: "redis" diff --git a/docker-compose.yml b/docker-compose.yml index d44d5024..270c986c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: image: tikazyq/crawlab:latest container_name: master environment: - CRAWLAB_API_ADDRESS: "localhost:8000" + CRAWLAB_API_ADDRESS: "http://localhost:8000" CRAWLAB_SERVER_MASTER: "Y" CRAWLAB_MONGO_HOST: "mongo" CRAWLAB_REDIS_ADDRESS: "redis" @@ -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