Skip to content

Commit e76fb46

Browse files
committed
等待mysql ready后再启动后端,playwright 支持到1.17.2
1 parent cc15ff5 commit e76fb46

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ BACKEND_WORKER=1
1111
# 前端镜像
1212
FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_front:1.5
1313
# 后端镜像
14-
BACKEND_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_backend:2.0
14+
BACKEND_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_backend:2.2
1515
# 爬虫镜像
16-
SPIDER_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder:1.7
16+
SPIDER_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder:1.8
1717
# 监控系统端口配置
1818
INFLUXDB_PORT_TCP=8086
1919
INFLUXDB_PORT_UDP=8089

docker-compose.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
container_name: feapder_backend
1818
image: ${BACKEND_IMAGE}
1919
restart: always
20-
command: uvicorn main:app --host 0.0.0.0 --workers ${BACKEND_WORKER} --port ${BACKEND_PORT} # workers 为后端服务的个数,爬虫多可改大点
20+
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 为后端服务的个数,爬虫多可改大点
2121
ports:
2222
- ${BACKEND_PORT}:${BACKEND_PORT} # 后端端口 (自定义端口:8000)
2323
environment:
@@ -48,6 +48,9 @@ services:
4848
- redis
4949
- influxdb
5050

51+
feapder:
52+
image: ${SPIDER_IMAGE}
53+
5154
mysql:
5255
container_name: feapder_backend_mysql
5356
command: mysqld --character-set-server=utf8mb4

0 commit comments

Comments
 (0)