From c84461d828a9be0dcbc47af39c24d3b1ab77f92a Mon Sep 17 00:00:00 2001 From: JianFeeeee Date: Fri, 2 Oct 2026 11:53:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(deploy):=20zd-host=20=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=87=8D=E6=89=93=E6=89=A9=E5=B1=95=E5=8C=85?= =?UTF-8?q?=EF=BC=88=E6=AD=A4=E5=89=8D=E7=BB=A7=E6=89=BF=E5=9F=BA=E9=95=9C?= =?UTF-8?q?=E5=83=8F=203=20=E5=91=A8=E5=89=8D=E7=9A=84=E6=97=A7=20zip/xpi?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 实测踩坑：增量 Dockerfile 只 COPY install.html，navi-chrome.zip/navi-firefox.xpi 全部来自基镜像 jianf-navi:latest。v99 升级后容器里的 chrome 包仍是旧版 （e6b8f9bf ≠ 仓库 51347771），扩展的修复永远上不了线。 现从当前源码重打两个包并 COPY 进镜像。 --- deploy/zd-host.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deploy/zd-host.sh b/deploy/zd-host.sh index 7c9925a..45f2bf1 100644 --- a/deploy/zd-host.sh +++ b/deploy/zd-host.sh @@ -46,9 +46,14 @@ cd "$SRC" node --check web/navi.js (cd admin-server && gofmt -l . && go test ./... >/dev/null) (cd history-server && gofmt -l . && go test ./... >/dev/null) -rm -rf "$CTX"; mkdir -p "$CTX/runtime" "$CTX/web/extension" "$CTX/admin" "$CTX/portal" +rm -rf "$CTX"; mkdir -p "$CTX/runtime" "$CTX/web/extension" "$CTX/admin" "$CTX/portal" "$CTX/ext" (cd history-server && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags='-s -w' -o "$CTX/runtime/history-server" .) (cd admin-server && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags='-s -w' -o "$CTX/runtime/admin-server" .) +# 扩展包必须从当前源码重打：不能继承基镜像里的旧包。 +# 实测踩坑（2026-10-02）：增量 Dockerfile 只 COPY install.html，zip/xpi 全部 +# 来自基镜像，导致 chrome background 的修复升级后仍不生效（包是 3 周前的）。 +(cd extension/chrome && zip -qr "$CTX/ext/navi-chrome.zip" .) +(cd extension/firefox && zip -qr "$CTX/ext/navi-firefox.xpi" .) cp nginx.conf supervisord.conf searxng-settings.yml conf.example.yml "$CTX/" cp admin/index.html "$CTX/admin/index.html" cp -a portal/. "$CTX/portal/" @@ -65,6 +70,8 @@ COPY conf.example.yml /app/defaults/conf.yml COPY admin/index.html /app/admin/index.html COPY portal /app/portal COPY web/extension/install.html /app/dashy/extension/install.html +COPY ext/navi-chrome.zip /app/dashy/extension/navi-chrome.zip +COPY ext/navi-firefox.xpi /app/dashy/extension/navi-firefox.xpi COPY web/navi.js /app/dashy/navi.js COPY web/navi.css /app/dashy/navi.css COPY web/patch-index.py /tmp/patch-index.py