40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From f999d58eef24da10c53b2a4f45dc0a88fe2f4e89 Mon Sep 17 00:00:00 2001
|
||
From: HenryDu8133 <813367384@qq.com>
|
||
Date: Sun, 6 Sep 2026 09:46:55 +0800
|
||
Subject: [PATCH 09/58] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=20voicehub=20?=
|
||
=?UTF-8?q?=E9=A1=B6=E5=B1=82=20cpus/mem=5Flimit=EF=BC=8C=E9=81=BF?=
|
||
=?UTF-8?q?=E5=85=8D=E4=B8=8E=20deploy.resources=20=E9=87=8D=E5=A4=8D?=
|
||
=?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8A=A5=E9=94=99?=
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
---
|
||
docker-compose.yml | 9 ++++-----
|
||
1 file changed, 4 insertions(+), 5 deletions(-)
|
||
|
||
diff --git a/docker-compose.yml b/docker-compose.yml
|
||
index de070a1..abb81bc 100644
|
||
--- a/docker-compose.yml
|
||
+++ b/docker-compose.yml
|
||
@@ -56,12 +56,11 @@ services:
|
||
|
||
# ===== 日志/性能 =====
|
||
NODE_OPTIONS: ${NODE_OPTIONS:-"--max-old-space-size=768"}
|
||
+
|
||
# 2C4G 机器的推荐配置（.env 可覆盖）；小机器 1C2G 也能跑
|
||
- # ⚠️ 注意：cpus 默认值不能加双引号！新版 Docker Compose v2 严格类型：
|
||
- # 加引号会解析为字符串 '"1.5"' → ParseFloat 失败报错
|
||
- mem_limit: ${APP_MEM_LIMIT:-1400m}
|
||
- mem_reservation: ${APP_MEM_RESERVATION:-384m}
|
||
- cpus: ${APP_CPUS:-1.5}
|
||
+ # ⚠️ 关键：用 deploy.resources.{limits|reservations} 这一套，
|
||
+ # 不要同时在顶层写 cpus/mem_limit/mem_reservation！
|
||
+ # Docker Compose v2 禁止两套资源字段并存，会报 invalid compose project。
|
||
deploy:
|
||
resources:
|
||
limits:
|
||
--
|
||
2.45.1.windows.1
|
||
|