生产 v0.3.8~v0.3.13 均由 8013196 加工作区修改构建部署,此前未提交;本提交补齐源码,
并含未部署的 v0.3.14 原地入库。中间各版本源码状态未保存,无法逐版拆分,详见
docs/plan/17-full-upgrade.md 与 docs/plan/18-organize-release.md。
- v0.3.8 全面升级:Deno workspace 依赖、Router 8 / Vite 8、camofox 1.18.0 / Node 24、
PostgreSQL 18.6、备份客户端 18.6、演示 qB 5.2.4
- v0.3.9 媒体整理:分类规则、整理来源与目录快照(0059)、文件管理整理入口
- v0.3.10 手动下载与入库:独立手动下载、详情页资源下载、TMDB / Local 元数据兜底
(metadata.resolve_organize)、正常多版本 / 一次性洗版(0060)
- v0.3.11 搜索详情与桌面黑边修复
- v0.3.12 列表分页、搜索历史、首页概况
- v0.3.13 统一整理弹窗与队列
- v0.3.14 原地入库(0061,未部署)
同批审计修复:
- 刮削入队:确认原记录存在后才删重放产生的新记录;写回 run 关联失败时保持 queued,
由处理器补关联(对齐 MP 先登记、只在入队失败时记失败)
- 识别升级链只在结果更确定时采用,不再用 no_match 顶替原有歧义候选
- bluray_dir 资产以原盘目录本身为刮削根(MP 同做法)
- metadata.resolve_organize 登记到入库排障 Skill 与能力地图
- db/src/types.ts 按迁移重新生成;contracts 整理动作枚举顺序与数据库对齐
- 测试:原地入库用例改为直接查记录表;domain 测试模板补 version
- 前端:通知铃铛弹层与用户菜单统一样式;站点卡片共用卡头、底栏贴底、分页间距
依赖升级证据只提交摘要文件,registry-snapshot.json 移至 .local/(SHA-256 记于文档)。
Co-Authored-By: Claude Opus 5.5 <[email protected]>
81 lines
4.0 KiB
Docker
81 lines
4.0 KiB
Docker
# camofox-browser v1.18.0; upstream commit f94c81babf4bfd44cdd4bd46e1f2e1fb1d91c753.
|
|
# Build with: docker build --build-context upstream=https://github.com/jo-inc/camofox-browser.git#f94c81babf4bfd44cdd4bd46e1f2e1fb1d91c753 -t camofox-browser:1.18.0 docker/camofox
|
|
# Runtime manifest/lock below are maintained locally; never run audit fix while building.
|
|
ARG CAMOUFOX_ASSET_STAGE=downloaded-browser
|
|
FROM node:24.21.0-trixie-slim@sha256:8ec5d7557396cfe32d21c3f9c13072355ceab22b584578ca4bb28af31120cffe AS browser-base
|
|
|
|
ARG CAMOUFOX_VERSION=152.0.4
|
|
ARG CAMOUFOX_RELEASE=beta.30
|
|
ARG TARGETARCH
|
|
ARG APT_MIRROR=
|
|
|
|
RUN if [ -n "$APT_MIRROR" ]; then sed -i "[email protected]@${APT_MIRROR}@g" /etc/apt/sources.list.d/debian.sources; fi \
|
|
&& apt-get update \
|
|
&& apt-get upgrade -y --no-install-recommends \
|
|
&& apt-get install -y \
|
|
libgtk-3-0 libdbus-glib-1-2 libxt6 libasound2 libx11-xcb1 libxcomposite1 libxcursor1 libxdamage1 libxfixes3 \
|
|
libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
|
|
libegl1 libgl1-mesa-dri libgbm1 \
|
|
xvfb fonts-liberation fonts-noto-color-emoji fontconfig \
|
|
ca-certificates curl unzip python3-minimal \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Optional local asset context accelerates builds without changing integrity checks.
|
|
FROM browser-base AS downloaded-browser
|
|
RUN case "${TARGETARCH}" in \
|
|
amd64) ARCH=x86_64; CAMOUFOX_SHA256=5720d45b894ce1770543de024c6f10d514b38be560fa2dc3226b3d8586caf672 ;; \
|
|
arm64) ARCH=arm64; CAMOUFOX_SHA256=60447260af8bebdb0ec3f2aa72f687b879e5598367303de2e3fdbc7a5be8c124 ;; \
|
|
*) echo "Unsupported architecture: ${TARGETARCH}" >&2; exit 1 ;; \
|
|
esac \
|
|
&& curl -fL -o /tmp/camoufox.zip "https://github.com/daijro/camoufox/releases/download/v${CAMOUFOX_VERSION}-${CAMOUFOX_RELEASE}/camoufox-${CAMOUFOX_VERSION}-${CAMOUFOX_RELEASE}-lin.${ARCH}.zip"
|
|
|
|
FROM browser-base AS provided-browser
|
|
COPY --from=browser-asset /camoufox.zip /tmp/camoufox.zip
|
|
|
|
FROM ${CAMOUFOX_ASSET_STAGE} AS camofox-browser
|
|
ARG TARGETARCH
|
|
RUN case "${TARGETARCH}" in \
|
|
amd64) ARCH=x86_64; CAMOUFOX_SHA256=5720d45b894ce1770543de024c6f10d514b38be560fa2dc3226b3d8586caf672 ;; \
|
|
arm64) ARCH=arm64; CAMOUFOX_SHA256=60447260af8bebdb0ec3f2aa72f687b879e5598367303de2e3fdbc7a5be8c124 ;; \
|
|
*) echo "Unsupported architecture: ${TARGETARCH}" >&2; exit 1 ;; \
|
|
esac \
|
|
&& mkdir -p /root/.cache/camoufox \
|
|
&& echo "${CAMOUFOX_SHA256} /tmp/camoufox.zip" | sha256sum -c - \
|
|
&& (unzip -q /tmp/camoufox.zip -d /root/.cache/camoufox || true) \
|
|
&& rm /tmp/camoufox.zip \
|
|
&& chmod -R 755 /root/.cache/camoufox \
|
|
&& echo "{\"version\":\"${CAMOUFOX_VERSION}\",\"release\":\"${CAMOUFOX_RELEASE}\"}" > /root/.cache/camoufox/version.json \
|
|
&& test -f /root/.cache/camoufox/camoufox-bin
|
|
|
|
WORKDIR /app
|
|
|
|
COPY package.json package-lock.json ./
|
|
COPY --from=upstream postinstall.js ./
|
|
COPY --from=upstream scripts/ ./scripts/
|
|
COPY --from=upstream lib/ ./lib/
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends build-essential python3 \
|
|
&& npm ci --omit=dev \
|
|
&& apt-get purge -y --auto-remove build-essential \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
COPY --from=upstream server.js camofox.config.json ./
|
|
COPY --from=upstream mcp/server.mjs ./mcp/server.mjs
|
|
COPY --from=upstream mcp/lib/ ./mcp/lib/
|
|
# MCP uses the same installed parent dependency tree; do not ship the unused upstream lock.
|
|
COPY mcp-package.json ./mcp/package.json
|
|
COPY --from=upstream plugins/ ./plugins/
|
|
|
|
RUN sh scripts/install-plugin-deps.sh
|
|
|
|
LABEL org.opencontainers.image.source="https://github.com/jo-inc/camofox-browser" \
|
|
org.opencontainers.image.version="v1.18.0" \
|
|
org.opencontainers.image.revision="f94c81babf4bfd44cdd4bd46e1f2e1fb1d91c753"
|
|
|
|
ENV NODE_ENV=production
|
|
ENV CAMOFOX_PORT=9377
|
|
EXPOSE 9377
|
|
# exec:让 node 成为 PID 1 收到 SIGTERM。上游用 `sh -c "node …"`,sh 不转发信号,docker stop/restart 等满宽限期后
|
|
# SIGKILL,持久化插件的关机落盘(server:shutdown)不会执行,上次落盘之后的登录状态全部丢失(2026-09-28 实测)
|
|
CMD ["sh", "-c", "exec node --max-old-space-size=${MAX_OLD_SPACE_SIZE:-128} server.js"]
|