7ebebbc3a9
上一版只改 index.html 注入 /favicon.svg，实测仍不显示。用 MutationObserver
在真实浏览器里观察到：**Dashy 前端 JS 在运行时把 <link rel=icon> 改写成
/icons/favicon.ico**，服务端注入的标签被它覆盖；而镜像里从来不存在
/icons/ 目录 ⇒ 请求落到 try_files 兜底的 index.html，content-type 是
text/html，浏览器当无效图标忽略（于是表现为「图标消失」）。
静态改 index.html 治不了本，只能把这个路径补上：
Dockerfile 与 zd-host.sh 都 COPY favicon.{ico,svg} 到 /app/dashy/icons/。
已先在 106 上热修（只 cp 不重启，无闪断）恢复显示。
实测：/icons/favicon.ico → 200 image/x-icon，浏览器解码 16x16 成功；
apple-touch-icon 180x180 正常。
118 lines
5.0 KiB
Docker
118 lines
5.0 KiB
Docker
# 不用 `# syntax=docker/dockerfile:1`：该指令会让 BuildKit 去 pull
|
||
# docker/dockerfile 前端镜像，在无外网/仅代理的环境里会直接构建失败。
|
||
# 本文件未使用任何 BuildKit 专有语法，去掉后走内置前端即可。
|
||
|
||
# ── Stage 1: Go binaries ──
|
||
FROM golang:1.21-bookworm AS gobuild
|
||
|
||
WORKDIR /src/history
|
||
COPY history-server/ .
|
||
RUN GOPROXY=https://goproxy.cn,direct CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/history-server .
|
||
|
||
WORKDIR /src/admin
|
||
COPY admin-server/ .
|
||
RUN GOPROXY=https://goproxy.cn,direct go mod tidy && CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/admin-server .
|
||
|
||
# ── Stage 2: SearXNG from source ──
|
||
FROM debian:bookworm-slim AS searxng-build
|
||
|
||
# 需要代理时用 --build-arg 传入（默认不设，保证他人环境可直接构建）
|
||
ARG HTTP_PROXY=
|
||
ARG HTTPS_PROXY=
|
||
|
||
ENV DEBIAN_FRONTEND=noninteractive
|
||
ENV http_proxy=${HTTP_PROXY}
|
||
ENV https_proxy=${HTTPS_PROXY}
|
||
ENV HTTP_PROXY=${HTTP_PROXY}
|
||
ENV HTTPS_PROXY=${HTTPS_PROXY}
|
||
|
||
RUN apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 update \
|
||
&& apt-get -o Acquire::Retries=5 install -y --no-install-recommends \
|
||
python3 python3-pip python3-venv git ca-certificates \
|
||
&& rm -rf /var/lib/apt/lists/*
|
||
|
||
RUN git clone --depth 1 https://github.com/searxng/searxng.git /src/searxng \
|
||
&& python3 -m venv /opt/searxng-venv \
|
||
&& /opt/searxng-venv/bin/pip install --upgrade pip setuptools wheel msgspec \
|
||
&& cd /src/searxng \
|
||
&& /opt/searxng-venv/bin/pip install --no-cache-dir -r requirements.txt \
|
||
&& /opt/searxng-venv/bin/pip install --no-cache-dir --no-build-isolation . \
|
||
&& rm -rf /src/searxng
|
||
|
||
# ── Stage 3: browser extension packages ──
|
||
# 供 /extension/install.html 下载（Chromium 用 zip，Firefox 用 xpi）
|
||
FROM debian:bookworm-slim AS extpack
|
||
|
||
RUN apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 update \
|
||
&& apt-get -o Acquire::Retries=5 install -y --no-install-recommends zip ca-certificates \
|
||
&& rm -rf /var/lib/apt/lists/*
|
||
|
||
COPY extension/chrome /src/chrome
|
||
COPY extension/firefox /src/firefox
|
||
# Go 的 -o 会自动建父目录，zip 不会，所以这里必须显式创建 /out
|
||
RUN mkdir -p /out \
|
||
&& cd /src/chrome && zip -qr /out/navi-chrome.zip . \
|
||
&& cd /src/firefox && zip -qr /out/navi-firefox.xpi .
|
||
|
||
# ── Stage 4: Runtime ──
|
||
FROM debian:bookworm-slim
|
||
|
||
ENV DEBIAN_FRONTEND=noninteractive
|
||
|
||
RUN apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 update \
|
||
&& apt-get -o Acquire::Retries=5 install -y --no-install-recommends \
|
||
nginx python3 supervisor curl ca-certificates git \
|
||
&& rm -rf /var/lib/apt/lists/*
|
||
|
||
# Copy SearXNG venv + source
|
||
COPY --from=searxng-build /opt/searxng-venv /app/searxng-venv
|
||
COPY --from=searxng-build /usr/lib/python3.11 /usr/lib/python3.11
|
||
COPY --from=searxng-build /lib/x86_64-linux-gnu /lib/x86_64-linux-gnu
|
||
COPY --from=searxng-build /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu
|
||
|
||
# Dashy static files
|
||
COPY --from=lissy93/dashy:latest /app/dist /app/dashy
|
||
|
||
# Go binaries
|
||
COPY --from=gobuild /out/history-server /usr/local/bin/history-server
|
||
COPY --from=gobuild /out/admin-server /usr/local/bin/admin-server
|
||
|
||
# Config files
|
||
COPY nginx.conf /etc/nginx/nginx.conf
|
||
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
||
COPY searxng-settings.yml /etc/searxng/settings.yml
|
||
COPY conf.example.yml /app/defaults/conf.yml
|
||
COPY admin/index.html /app/admin/index.html
|
||
COPY portal /app/portal
|
||
# 站点图标：纸飞机。覆盖 Dashy 自带的 web-icons/favicon-*.png，
|
||
# 这样即使将来上游 index.html 变了、patch 失效，标签栏仍是我们的图标。
|
||
COPY portal/favicon.svg /app/dashy/favicon.svg
|
||
COPY portal/favicon.ico /app/dashy/favicon.ico
|
||
COPY portal/apple-touch-icon.png /app/dashy/apple-touch-icon.png
|
||
COPY portal/web-icons/ /app/dashy/web-icons/
|
||
# 见 zd-host.sh 同名注释：Dashy 前端 JS 运行时会把 icon link 改成
|
||
# /icons/favicon.ico，而镜像里没有 /icons/ 目录，静态改 index.html 无效。
|
||
COPY portal/favicon.ico /app/dashy/icons/favicon.ico
|
||
COPY portal/favicon.svg /app/dashy/icons/favicon.svg
|
||
|
||
# 浏览器扩展安装页与安装包（通过 /extension/ 访问）
|
||
COPY web/extension/install.html /app/dashy/extension/install.html
|
||
COPY --from=extpack /out/navi-chrome.zip /app/dashy/extension/navi-chrome.zip
|
||
COPY --from=extpack /out/navi-firefox.xpi /app/dashy/extension/navi-firefox.xpi
|
||
|
||
# Inject search script into Dashy
|
||
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
|
||
# index.html 里不一定有 </body>，用脚本幂等注入，不能靠 sed 替换 </body>。
|
||
RUN python3 /tmp/patch-index.py /app/dashy/index.html
|
||
|
||
# Data directory
|
||
RUN mkdir -p /app/data/item-icons /app/data/gateway /var/log/supervisor /var/cache/searxng /run/nginx
|
||
|
||
VOLUME ["/app/data"]
|
||
EXPOSE 18080 3080 3081 8443
|
||
HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
|
||
CMD curl -fs http://localhost:18080/healthz || exit 1
|
||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|