feat: support app and docreader build download mirrors (#4073)
Pass the app APT mirror to all build stages and expose optional Playwright download hosts for docreader through the build script and Docker Compose. Document the mirror settings and WebKit-specific host precedence.main
parent
52617f6410
commit
602d0c388b
|
|
@ -32,12 +32,16 @@
|
|||
# ========== A1. 镜像版本与构建 ==========
|
||||
# WeKnora 镜像版本标签:latest(稳定版)/ main(最新开发版)。升级到固定版本时,请填写目标 release 的 git tag(如 v0.7.0,注意 v 前缀),并执行 docker compose pull 拉取对应镜像。
|
||||
WEKNORA_VERSION=latest
|
||||
# Alpine apk 镜像源(构建 app 镜像用,留空用默认源;国内可设 mirrors.tencent.com 加速)。
|
||||
# Debian APT 镜像源主机名(构建 app 镜像用,留空用默认源;国内可设 mirrors.tencent.com 加速)。
|
||||
APK_MIRROR_ARG=mirrors.tencent.com
|
||||
# 构建 app 镜像时是否链接 anydoc 进程内解析引擎(默认 1)。设 0 可跳过 Rust 工具链、缩短构建时间,引擎在设置页显示为不可用。
|
||||
# WITH_ANYDOC=1
|
||||
# docreader 镜像构建时 apt 镜像源(留空用默认源)。
|
||||
# APT_MIRROR=
|
||||
# docreader 镜像构建时 Playwright 浏览器制品源(留空用官方 CDN)。
|
||||
# PLAYWRIGHT_DOWNLOAD_HOST=
|
||||
# 仅覆盖 WebKit 制品源,设置后优先于 PLAYWRIGHT_DOWNLOAD_HOST。
|
||||
# PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST=
|
||||
# 从源码构建 frontend 镜像时写入系统信息页的短 commit。make docker-build-frontend
|
||||
# 与 start_all.sh --no-pull 会从 git 自动填充;直接 docker compose build 时请自行导出,否则显示 unknown。
|
||||
# VITE_FRONTEND_COMMIT=
|
||||
|
|
|
|||
|
|
@ -419,6 +419,8 @@ services:
|
|||
dockerfile: docker/Dockerfile.docreader
|
||||
args:
|
||||
- APT_MIRROR=${APT_MIRROR:-}
|
||||
- PLAYWRIGHT_DOWNLOAD_HOST=${PLAYWRIGHT_DOWNLOAD_HOST:-}
|
||||
- PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST=${PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST:-}
|
||||
container_name: WeKnora-docreader
|
||||
# docreader gRPC ships without auth/TLS and is only consumed by the app
|
||||
# container over the WeKnora-network (DOCREADER_ADDR defaults to
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
# Build extension and daemon from the same pinned source on the runtime architecture.
|
||||
FROM --platform=$TARGETPLATFORM node:24-bookworm-slim@sha256:ba849c60be29959425b8734d57b8b4b7d56f98edd9504c9af091d5281095a71e AS browserskill
|
||||
WORKDIR /build
|
||||
RUN apt-get update && \
|
||||
# Use the same optional Debian mirror as the Go builder and runtime stages.
|
||||
ARG APK_MIRROR_ARG
|
||||
RUN if [ -n "$APK_MIRROR_ARG" ]; then \
|
||||
sed -i "s@deb.debian.org@${APK_MIRROR_ARG}@g" /etc/apt/sources.list.d/debian.sources; \
|
||||
fi && \
|
||||
apt-get update && \
|
||||
apt-get install -y --no-install-recommends git python3 ca-certificates curl build-essential cmake pkg-config && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo
|
||||
|
|
|
|||
|
|
@ -142,8 +142,16 @@ ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
|
|||
|
||||
COPY --from=builder /usr/local/bin /usr/local/bin
|
||||
|
||||
# 安装 Playwright 浏览器(网页解析)
|
||||
RUN python -m playwright install webkit
|
||||
# 安装 Playwright 浏览器(网页解析)。可在构建时切换为内部制品库或镜像源。
|
||||
ARG PLAYWRIGHT_DOWNLOAD_HOST=""
|
||||
ARG PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST=""
|
||||
RUN if [ -n "$PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST" ]; then \
|
||||
PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST="$PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST" python -m playwright install webkit; \
|
||||
elif [ -n "$PLAYWRIGHT_DOWNLOAD_HOST" ]; then \
|
||||
PLAYWRIGHT_DOWNLOAD_HOST="$PLAYWRIGHT_DOWNLOAD_HOST" python -m playwright install webkit; \
|
||||
else \
|
||||
python -m playwright install webkit; \
|
||||
fi
|
||||
RUN python -m playwright install-deps webkit
|
||||
|
||||
COPY docreader/pyproject.toml docreader/uv.lock ./
|
||||
|
|
|
|||
|
|
@ -141,6 +141,7 @@ build_app_image() {
|
|||
--build-arg GOPRIVATE_ARG=${GOPRIVATE:-""} \
|
||||
--build-arg GOPROXY_ARG=${GOPROXY:-"https://goproxy.cn,direct"} \
|
||||
--build-arg GOSUMDB_ARG=${GOSUMDB:-"off"} \
|
||||
--build-arg APK_MIRROR_ARG="${APK_MIRROR_ARG:-}" \
|
||||
--build-arg VERSION_ARG="$VERSION" \
|
||||
--build-arg COMMIT_ID_ARG="$COMMIT_ID" \
|
||||
--build-arg BUILD_TIME_ARG="$BUILD_TIME" \
|
||||
|
|
@ -169,7 +170,9 @@ build_docreader_image() {
|
|||
--platform $PLATFORM \
|
||||
--build-arg PLATFORM=$PLATFORM \
|
||||
--build-arg TARGETARCH=$TARGETARCH \
|
||||
--build-arg APT_MIRROR=${APT_MIRROR:-} \
|
||||
--build-arg APT_MIRROR="${APT_MIRROR:-}" \
|
||||
--build-arg PLAYWRIGHT_DOWNLOAD_HOST="${PLAYWRIGHT_DOWNLOAD_HOST:-}" \
|
||||
--build-arg PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST="${PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST:-}" \
|
||||
-f docker/Dockerfile.docreader \
|
||||
-t wechatopenai/weknora-docreader:latest \
|
||||
.
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ make dev-logs / dev-status / dev-stop / dev-restart
|
|||
| Dockerfile | 产物镜像 | 要点 |
|
||||
| --- | --- | --- |
|
||||
| `docker/Dockerfile.app` | `wechatopenai/weknora-app` | 三阶段:先构建 BrowserSkill 的 `bsk` 与配套 Chrome 扩展(装入 `/opt/weknora/browserskill/`,见[本机浏览器](../05-clients/09-local-browser.md));再用 `golang:1.26-bookworm` 编译(`make build-prod`,默认 `WITH_ANYDOC=1` 链接进程内 office 解析引擎,注入版本信息,预下载 DuckDB 扩展 `cmd/download/duckdb`)→ `debian:12.12-slim` 运行层(含 `migrate` 迁移工具、python3/node/uvx(供 stdio MCP 使用)、ffmpeg(ASR)、gosu 降权,以及第三方许可证文本)。入口 `scripts/docker-entrypoint.sh`:修复挂载目录属主;若挂载了 docker.sock,按 socket GID 把 appuser 加入对应组(compose `group_add` 在 gosu 后无效),再以 appuser 运行 `./WeKnora`。`EXPOSE 8080` |
|
||||
| `docker/Dockerfile.docreader` | `wechatopenai/weknora-docreader` | Python 3.10 + uv 依赖锁定;生成 protobuf;运行层安装 LibreOffice、OpenJDK 17、antiword、Playwright(webkit)与 `grpc_health_probe`。轻量版不含 PaddleOCR。`EXPOSE 50051`。支持 `APT_MIRROR` 构建参数 |
|
||||
| `docker/Dockerfile.docreader` | `wechatopenai/weknora-docreader` | Python 3.10 + uv 依赖锁定;生成 protobuf;运行层安装 LibreOffice、OpenJDK 17、antiword、Playwright(webkit)与 `grpc_health_probe`。轻量版不含 PaddleOCR。`EXPOSE 50051`。支持 `APT_MIRROR`、`PLAYWRIGHT_DOWNLOAD_HOST` 和 `PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST` 构建参数 |
|
||||
| `docker/Dockerfile.odl-hybrid` | `weknora-odl-hybrid:local` | 安装 `opendataloader-pdf[hybrid]`(Docling),监听 5002,默认 `--no-ocr`;仅本地构建不发布 |
|
||||
| `docker/Dockerfile.sandbox` | `wechatopenai/weknora-sandbox` | Agent 会话沙箱镜像。基础环境为 Python 3.12-slim + Node 20 + uv/pnpm,默认 `root` 执行,保留 `user`(UID 1000) 供显式选择。默认构建目标 `sandbox` 供 Docker 后端使用;另有 `cube`(含 Cube envd)、`desktop` / `desktop-cube`(带图形桌面)等目标,见[沙箱部署](../06-development/04-sandbox-deployment.md) |
|
||||
| `frontend/Dockerfile` | `wechatopenai/weknora-ui` | 两阶段:digest 锁定的 `node:24-bookworm-slim`(`$BUILDPLATFORM`,避免多架构 CI 用 QEMU 跑 Vite)内 `npm ci` + `npm run build`(`VITE_IS_DOCKER` / `VITE_FRONTEND_COMMIT`),可选 `NPM_REGISTRY` / `NODE_MAX_OLD_SPACE_SIZE`;运行层为按 digest 固定的 `nginx:1.30.3-alpine`(兼容 CentOS 7 旧内核)。无需宿主机预构建 `dist/` |
|
||||
|
|
@ -148,6 +148,16 @@ make docker-build-docreader
|
|||
make docker-build-frontend
|
||||
```
|
||||
|
||||
docreader 在国内或企业内网构建时,可同时切换 APT 和 Playwright 制品源:
|
||||
|
||||
```bash
|
||||
APT_MIRROR=https://your-apt-mirror.example.com \
|
||||
PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST=https://your-playwright-mirror.example.com \
|
||||
./scripts/build_images.sh --docreader
|
||||
```
|
||||
|
||||
`APT_MIRROR` 需传入保留 `/debian` 和 `/debian-security` 路径结构的镜像站根地址;Playwright 制品源需保留官方制品的路径结构。仅配置 WebKit 时优先使用 `PLAYWRIGHT_WEBKIT_DOWNLOAD_HOST`,它的优先级高于通用的 `PLAYWRIGHT_DOWNLOAD_HOST`。
|
||||
|
||||
## 四、Makefile 部署相关目标速查
|
||||
|
||||
| 目标 | 作用 |
|
||||
|
|
|
|||
Loading…
Reference in New Issue