From f3df8b93a506ef93d2907f956ee95d09824f0549 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 30 Sep 2026 12:05:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(deploy):=20build=20=E6=97=B6=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E7=B2=BE=E7=AE=80=E7=89=88=20Dockerfile=20/=20nginx.c?= =?UTF-8?q?onf=20=E6=AE=8B=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **影响**:build 阶段 (`bash deploy/build.sh --no-push`) 报 Dockerfile COPY 错误, 镜像未生成。修正后镜像 `ipass-sso-v0.6.0` 本地构建成功,nginx -t 通过、 容器启动正常、`/admin/` 与 `/.well-known/openid-configuration` 双 200。 **改动**: - `deploy/Dockerfile`: - 删 `COPY deploy/custom/ ...`(精简版无 deploy/custom/ 目录) - 删 `COPY deploy/legacy/ ...`(精简版无 deploy/legacy/ 目录) - `EXPOSE 18098 18099` → `EXPOSE 18098`(精简版没 LLM 数据面,18099 用不到) - `deploy/nginx.conf`: - 删 `location /static/custom/ {...}`(精简版无 static-custom/) - 删 `location /legacy/ {...}`(精简版不集成老管理台) **设计**:上一步 commit 漏了 Dockerfile / nginx.conf 与文件系统的同步: rsync 自 ipass-all 时连带 rsync 来了 deploy/custom/ 与 deploy/legacy/, 后续又手动 rm 掉了这两个目录,但 Dockerfile 里的 COPY 与 nginx.conf 里的 alias location 没同步清。 Co-Authored-By: Claude Code --- deploy/Dockerfile | 8 +++----- deploy/nginx.conf | 13 ++----------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 37083f5..f7e44f0 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -92,10 +92,8 @@ COPY deploy/nginx.conf /usr/local/nginx/conf/nginx.conf # ipass-core 壳收集进 deploy/shell、各插件 dist 收集进 deploy/static-plugins COPY deploy/shell/ /usr/local/nginx/www/ COPY deploy/static-plugins/ /usr/local/nginx/static-plugins/ -# 装配层自定义页清单(core 壳 boot 时拉取并注册为自定义页;其他装配可没有) -COPY deploy/custom/ /usr/local/nginx/static-custom/ -# 老管理台多页应用(collect-legacy.sh 从各仓提取,壳内 iframe 原样集成) -COPY deploy/legacy/ /usr/local/nginx/www/legacy/ +# 装配层自定义页清单(精简版不挂自定义页,无 deploy/custom/) +# 老管理台多页应用(精简版不集成老管理台,无 deploy/legacy/) # 种子数据(admin/alice + OAuth 接入方 + 插件启停注册表) COPY data-seed/ /usr/local/nginx/data-seed/ @@ -114,7 +112,7 @@ COPY scripts/seed-data.sh /usr/local/nginx/scripts/seed-data.sh RUN chmod +x /usr/local/nginx/scripts/container-entrypoint.sh /usr/local/nginx/scripts/seed-data.sh WORKDIR /usr/local/nginx -EXPOSE 18098 18099 +EXPOSE 18098 STOPSIGNAL SIGQUIT ENTRYPOINT ["/usr/local/nginx/scripts/container-entrypoint.sh"] diff --git a/deploy/nginx.conf b/deploy/nginx.conf index b912392..95a23e1 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -136,16 +136,7 @@ http { alias /usr/local/nginx/static-plugins/; add_header Cache-Control "no-store" always; } - # 装配层自定义页清单(壳 boot 时拉取 /static/custom/custom-pages.json 注册自定义页) - location /static/custom/ { - alias /usr/local/nginx/static-custom/; - add_header Cache-Control "no-store" always; - } - - # 老管理台多页应用(壳内 iframe 原样集成;纯静态,不开 ipass_api) - location /legacy/ { - alias /usr/local/nginx/www/legacy/; - add_header Cache-Control "no-store" always; - } + # 装配层自定义页清单(精简版不挂自定义页,无 /static/custom/) + # 老管理台多页应用(精简版不集成老管理台,无 /legacy/) } } \ No newline at end of file