diff --git a/.env b/.env index 88ecd95..7c94768 100644 --- a/.env +++ b/.env @@ -11,9 +11,9 @@ BACKEND_WORKER=1 # 前端镜像 FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_front:2.5 # 后端镜像 -BACKEND_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_backend:3.7 +BACKEND_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feaplat_backend:3.9 # 爬虫镜像 -SPIDER_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder:2.5 +SPIDER_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feaplat_worker:2.6 # 监控系统端口配置 INFLUXDB_PORT_TCP=8086 INFLUXDB_PORT_UDP=8089 diff --git a/README.md b/README.md index 38f891e..fa55d2f 100644 --- a/README.md +++ b/README.md @@ -120,21 +120,27 @@ yum -y install git ``` #### 1. 下载项目 +> 先按照下面命令拉取develop分支代码运行。 +> master分支不支持urllib3>=2.0版本,现在已经运行不起来了,但之前老用户不受影响。待后续测试好兼容性,不影响老用户后,会将develop分支合并到master + gitub ```shell -git clone https://github.com/Boris-code/feaplat.git +git clone -b develop https://github.com/Boris-code/feaplat.git ``` gitee ```shell -git clone https://gitee.com/Boris-code/feaplat.git +git clone -b develop https://gitee.com/Boris-code/feaplat.git ``` + #### 2. 运行 首次运行需拉取镜像,时间比较久,且运行可能会报错,再次运行下就好了 ```shell cd feaplat +docker compose up -d +如果报错,尝试用下面命令运行 docker-compose up -d ``` diff --git a/docker-compose-without-network.yaml b/docker-compose-without-network.yaml deleted file mode 100644 index af92f02..0000000 --- a/docker-compose-without-network.yaml +++ /dev/null @@ -1,122 +0,0 @@ -version: "3.5" - -x-logging: &default-logging - options: - max-size: "100m" - max-file: "1" - driver: json-file - -services: - feapder_front: - container_name: feapder_front - image: ${FRONT_IMAGE} - restart: always - environment: - - BACKEND_URL=http://feapder_backend:${BACKEND_PORT} - - FRONT_PORT=${FRONT_PORT} - ports: - - ${FRONT_PORT}:${FRONT_PORT} # 前端端口 (自定义端口:80) - depends_on: - - feapder_backend - logging: *default-logging - - feapder_backend: - container_name: feapder_backend - image: ${BACKEND_IMAGE} - restart: always - command: /wait-for-it.sh mysql:3306 -t 60 --strict -- uvicorn main:app --host 0.0.0.0 --workers ${BACKEND_WORKER} --port ${BACKEND_PORT} # workers 为后端服务的个数,爬虫多可改大点 - ports: - - ${BACKEND_PORT}:${BACKEND_PORT} # 后端端口 (自定义端口:8000) - environment: - - FEAPDER_BACKEND_URL=http://${BACKEND_HOST}:${BACKEND_PORT} - - AUTHORIZATION_CODE=${AUTHORIZATION_CODE} # 授权码 - - DB_URL=mysql+pymysql://root:root123@mysql:3306/feapder_platform?charset=utf8mb4 # 后端数据库配置 - - REDIS_DB_URL=redis://:feapderYYDS@redis:6379/0 # redis数据库连接配置 redis://[[username]:[password]]@[host]:[port]/[db] - - ACCESS_TOKEN_EXPIRE_MINUTES=1440 # 管理系统账号cookie过期时间 单位分钟 - - SPIDER_IMAGE=${SPIDER_IMAGE} # 爬虫镜像 - - SPIDER_AUTO_PULL_IMAGE=1 # 是否自动拉取镜像 否则需要在爬虫节点手动 docker pull 爬虫镜像,为了加快启动速度,可以设置0 - - SPIDER_ENV={} # 爬虫环境变量 值为json类型 - # 爬虫容器启动参数,支持的参数使用 docker service create --help 查看 - - SPIDER_RUN_ARGS={} - # git ssh 私有密钥,不填则使用默认的 - - GIT_SSH_PRIVATE_KEY=${GIT_SSH_PRIVATE_KEY} - # 监控配置 - - INFLUXDB_HOST=${INFLUXDB_HOST} - - INFLUXDB_DB=${INFLUXDB_DB} - - INFLUXDB_ADMIN_USER=${INFLUXDB_ADMIN_USER} - - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_ADMIN_PASSWORD} - - INFLUXDB_PORT_TCP=8086 - - INFLUXDB_PORT_UDP=8089 - volumes: - - "/var/run/docker.sock:/var/run/docker.sock" - - "~/data/feapder/projects:/projects" # 上传的项目挂载, 本地目录:容器路径 - depends_on: - - mysql - - redis - - influxdb - logging: *default-logging - - feapder: - container_name: feapder_worker - image: ${SPIDER_IMAGE} - - mysql: - container_name: feapder_backend_mysql - command: mysqld --character-set-server=utf8mb4 - restart: always - image: registry.cn-hangzhou.aliyuncs.com/feapderd/mysql:5.7.29 - ports: - - ${MYSQL_PORT}:3306 - environment: - - "MYSQL_USER=root" - - "MYSQL_ROOT_PASSWORD=root123" - - "MYSQL_DATABASE=feapder_platform" - - "MYSQL_PASSWORD=root123" - volumes: - - "~/data/feapder/feapder_backend_mysql:/var/lib/mysql" # mysql 挂载, 本地目录:容器路径 - logging: *default-logging - - redis: - container_name: feapder_backend_redis - command: redis-server --appendonly yes --requirepass feapderYYDS - restart: always - image: registry.cn-hangzhou.aliyuncs.com/feapderd/redis:6.0.10 -# ports: -# - ${REDIS_PORT}:6379 - volumes: - - "~/data/feapder/feapder_backend_redis:/data" # redis 挂载, 本地目录:容器路径 - logging: *default-logging - -# # 监控 -# grafana: -# user: root -# restart: always -# image: grafana/grafana -# container_name: feapder_grafana -# volumes: -# - ~/data/feapder/grafana:/var/lib/grafana -# environment: -# - GF_SECURITY_ADMIN_USER=admin -# - GF_SECURITY_ADMIN_PASSWORD=admin -# ports: -# - ${GRAFANA_PORT}:3000 -# depends_on: -# - influxdb - - influxdb: - restart: always - image: registry.cn-hangzhou.aliyuncs.com/feapderd/influxdb:1.8.6 - container_name: feapder_influxdb - volumes: - - ~/data/feapder/influxdb:/var/lib/influxdb - - ./conf/influxdb.conf:/etc/influxdb/influxdb.conf - environment: - - INFLUXDB_DB=${INFLUXDB_DB} - - INFLUXDB_ADMIN_USER=${INFLUXDB_ADMIN_USER} - - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_ADMIN_PASSWORD} - - INFLUXDB_USER=influx - - INFLUXDB_USER_PASSWORD=influx - ports: - - ${INFLUXDB_PORT_TCP}:8086 - - ${INFLUXDB_PORT_UDP}:8089/udp - logging: *default-logging \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 77d4b61..d5bea02 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -28,6 +28,7 @@ services: ports: - ${BACKEND_PORT}:${BACKEND_PORT} # 后端端口 (自定义端口:8000) environment: + - VERIFY_HOST=https://plat.feapder.com - FEAPDER_BACKEND_URL=http://${BACKEND_HOST}:${BACKEND_PORT} - AUTHORIZATION_CODE=${AUTHORIZATION_CODE} # 授权码 - DB_URL=mysql+pymysql://root:root123@mysql:3306/feapder_platform?charset=utf8mb4 # 后端数据库配置 @@ -37,7 +38,7 @@ services: - SPIDER_AUTO_PULL_IMAGE=1 # 是否自动拉取镜像 否则需要在爬虫节点手动 docker pull 爬虫镜像,为了加快启动速度,可以设置0 - SPIDER_ENV={} # 爬虫环境变量 值为json类型 # 爬虫容器启动参数,支持的参数使用 docker service create --help 查看 - - SPIDER_RUN_ARGS=["--network feaplat", "--log-opt max-size=20m", "--log-opt max-file=1"] + - SPIDER_RUN_ARGS=["--network feaplat", "--log-opt max-size=20m", "--log-opt max-file=1", "--mount type=volume,source=feaplat_worker_python3.10.8,destination=/usr/local/python-3.10.8"] # git ssh 私有密钥,不填则使用默认的 - GIT_SSH_PRIVATE_KEY=${GIT_SSH_PRIVATE_KEY} # 监控配置 @@ -45,8 +46,8 @@ services: - INFLUXDB_DB=${INFLUXDB_DB} - INFLUXDB_ADMIN_USER=${INFLUXDB_ADMIN_USER} - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_ADMIN_PASSWORD} - - INFLUXDB_PORT_TCP=8086 - - INFLUXDB_PORT_UDP=8089 + - INFLUXDB_PORT_TCP=${INFLUXDB_PORT_TCP} + - INFLUXDB_PORT_UDP=${INFLUXDB_PORT_UDP} volumes: - "/var/run/docker.sock:/var/run/docker.sock" - "~/data/feapder/projects:/projects" # 上传的项目挂载, 本地目录:容器路径 @@ -126,3 +127,7 @@ networks: name: feaplat driver: overlay attachable: true + ipam: + config: + - subnet: 11.0.0.0/8 + gateway: 11.0.0.1