Skip to content

Commit a3f17a8

Browse files
authored
Merge branch 'main' into develop
2 parents 93a1e8b + be4194e commit a3f17a8

File tree

4 files changed

+14
-46
lines changed

4 files changed

+14
-46
lines changed

README-zh.md

+4-22
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,11 @@
3030

3131
基于Golang的分布式爬虫管理平台,支持Python、NodeJS、Go、Java、PHP等多种编程语言以及多种爬虫框架。
3232

33-
[查看演示 Demo](https://demo-pro.crawlab.cn) | [文档](https://docs.crawlab.cn) | [文档 (v0.6-beta)](https://docs-next.crawlab.cn)
33+
[查看演示 Demo](https://demo-pro.crawlab.cn) | [文档](https://docs.crawlab.cn/zh/)
3434

3535
## 安装
3636

37-
三种方式:
38-
1. [Docker](http://docs.crawlab.cn/zh/Installation/Docker.html)(推荐)
39-
2. [直接部署](http://docs.crawlab.cn/zh/Installation/Direct.html)(了解内核)
40-
3. [Kubernetes](http://docs.crawlab.cn/zh/Installation/Kubernetes.html) (多节点部署)
41-
42-
### 要求(Docker)
43-
- Docker 18.03+
44-
- MongoDB 3.6+
45-
- Docker Compose 1.24+ (可选,但推荐)
46-
47-
### 要求(直接部署)
48-
- Go 1.15+
49-
- Node 12.20+
50-
- MongoDB 3.6+
51-
- [SeaweedFS](https://github.com/chrislusf/seaweedfs) 2.59+
37+
您可以参考这个[安装指南](https://docs.crawlab.cn/zh/guide/installation)
5238

5339
## 快速开始
5440

@@ -109,7 +95,7 @@ services:
10995
- master
11096

11197
mongo:
112-
image: mongo:latest
98+
image: mongo:4.2
11399
container_name: crawlab_example_mongo
114100
restart: always
115101
```
@@ -120,11 +106,7 @@ services:
120106
docker-compose up -d
121107
```
122108

123-
Docker部署的详情,请见[相关文档](https://tikazyq.github.io/crawlab-docs/Installation/Docker.html)。
124-
125-
### 直接部署
126-
127-
请参考[相关文档](https://tikazyq.github.io/crawlab-docs/Installation/Direct.html)。
109+
Docker部署的详情,请见[相关文档](https://docs.crawlab.cn/zh/guide/installation/docker.html)。
128110

129111
## 截图
130112

README.md

+5-19
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,11 @@
3030

3131
Golang-based distributed web crawler management platform, supporting various languages including Python, NodeJS, Go, Java, PHP and various web crawler frameworks including Scrapy, Puppeteer, Selenium.
3232

33-
[Demo](https://demo-pro.crawlab.cn) | [Documentation](https://docs.crawlab.cn) | [Documentation (v0.6-beta)](http://docs-next.crawlab.cn)
33+
[Demo](https://demo-pro.crawlab.cn) | [Documentation](https://docs.crawlab.cn/en/)
3434

3535
## Installation
3636

37-
Three methods:
38-
1. [Docker](http://docs.crawlab.cn/en/Installation/Docker.html) (Recommended)
39-
2. [Direct Deploy](http://docs.crawlab.cn/en/Installation/Direct.html) (Check Internal Kernel)
40-
3. [Kubernetes](http://docs.crawlab.cn/en/Installation/Kubernetes.html) (Multi-Node Deployment)
41-
42-
### Pre-requisite (Docker)
43-
- Docker 18.03+
44-
- MongoDB 3.6+
45-
- Docker Compose 1.24+ (optional but recommended)
46-
47-
### Pre-requisite (Direct Deploy)
48-
- Go 1.15+
49-
- Node 12.20+
50-
- MongoDB 3.6+
51-
- [SeaweedFS](https://github.com/chrislusf/seaweedfs) 2.59+
37+
You can follow the [installation guide](https://docs.crawlab.cn/en/guide/installation/).
5238

5339
## Quick Start
5440

@@ -60,7 +46,7 @@ cd examples/docker/basic
6046
docker-compose up -d
6147
```
6248

63-
Next, you can look into the `docker-compose.yml` (with detailed config params) and the [Documentation (Chinese)](http://docs.crawlab.cn) for further information.
49+
Next, you can look into the `docker-compose.yml` (with detailed config params) and the [Documentation](http://docs.crawlab.cn/en/) for further information.
6450

6551
## Run
6652

@@ -110,7 +96,7 @@ services:
11096
- master
11197

11298
mongo:
113-
image: mongo:latest
99+
image: mongo:4.2
114100
container_name: crawlab_example_mongo
115101
restart: always
116102
```
@@ -121,7 +107,7 @@ Then execute the command below, and Crawlab Master and Worker Nodes + MongoDB wi
121107
docker-compose up -d
122108
```
123109

124-
For Docker Deployment details, please refer to [relevant documentation](https://tikazyq.github.io/crawlab-docs/Installation/Docker.html).
110+
For Docker Deployment details, please refer to [relevant documentation](https://docs.crawlab.cn/en/guide/installation/docker.html).
125111

126112

127113
## Screenshot

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ services:
1111
depends_on:
1212
- mongo
1313
mongo:
14-
image: mongo:4.2
14+
image: mongo:4.2

frontend/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -4363,9 +4363,9 @@ events@^3.0.0:
43634363
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
43644364

43654365
eventsource@^1.0.7:
4366-
version "1.1.0"
4367-
resolved "https://registry.npmmirror.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
4368-
integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
4366+
version "1.1.1"
4367+
resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f"
4368+
integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA==
43694369
dependencies:
43704370
original "^1.0.0"
43714371

@@ -7055,7 +7055,7 @@ ora@^3.4.0:
70557055

70567056
original@^1.0.0:
70577057
version "1.0.2"
7058-
resolved "https://registry.npmmirror.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
7058+
resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
70597059
integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
70607060
dependencies:
70617061
url-parse "^1.4.3"

0 commit comments

Comments
 (0)