diff --git a/infra/docker/worker.Dockerfile b/infra/docker/worker.Dockerfile index 9b0c0ca5c..0639128cb 100755 --- a/infra/docker/worker.Dockerfile +++ b/infra/docker/worker.Dockerfile @@ -2,10 +2,9 @@ # Worker Dockerfile - 优化版(多阶段构建 + 镜像瘦身 + cache mount加速) # 优化项: # 1. 多阶段构建:builder 阶段安装编译依赖,runtime 阶段只保留运行时 -# 2. ffmpeg 静态编译替换:从 apt 安装(457MB) 改为静态二进制(~80MB) +# 2. ffmpeg 通过 apt 安装(阿里云镜像加速,几秒完成,稳定可靠) # 3. Python 依赖瘦身:strip .so 调试符号 + 清理测试文件 + 清理缓存 # 4. pip cache mount:加速依赖下载(跨构建共享pip wheel缓存) -# 5. ffmpeg cache mount:避免每次重新下载静态编译包 # ============================================================ # ==================== Builder 阶段 ==================== @@ -21,48 +20,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ g++ \ python3-dev \ binutils \ - wget \ - xz-utils \ && rm -rf /var/lib/apt/lists/* -# ---- 下载静态编译 ffmpeg(带缓存+完整性校验+多源重试)---- -# 注意:必须用纯sh语法(dash兼容),不能用bash数组、[[ ]]等特性 -# 修复策略:1.三源下载 2.tar完整性校验 3.损坏删缓存重试 4.二进制可执行校验 -RUN --mount=type=cache,target=/tmp/ffmpeg-cache,sharing=locked \ - cd /tmp \ - && FFMPEG_FILE="/tmp/ffmpeg-cache/ffmpeg-release-amd64-static.tar.xz" \ - && download_ok=0 \ - && for src in \ - "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" \ - "https://mirrors.tuna.tsinghua.edu.cn/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" \ - "https://mirrors.ustc.edu.cn/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz"; \ - do \ - if [ $download_ok -eq 0 ] && [ -f "$FFMPEG_FILE" ] && tar -tf "$FFMPEG_FILE" >/dev/null 2>&1; then \ - echo "[ffmpeg] cache valid, skip download"; \ - download_ok=1; \ - break; \ - fi; \ - rm -f "$FFMPEG_FILE"; \ - echo "[ffmpeg] downloading from $src"; \ - if wget -q --tries=3 --timeout=30 -O "$FFMPEG_FILE" "$src"; then \ - if tar -tf "$FFMPEG_FILE" >/dev/null 2>&1; then \ - echo "[ffmpeg] download OK, tar valid"; \ - download_ok=1; \ - break; \ - else \ - echo "[ffmpeg] corrupted file, removing cache"; \ - rm -f "$FFMPEG_FILE"; \ - fi; \ - fi; \ - done \ - && if [ $download_ok -eq 0 ]; then echo "[ffmpeg] ALL SOURCES FAILED"; exit 1; fi \ - && tar xf "$FFMPEG_FILE" \ - && cp ffmpeg-*-amd64-static/ffmpeg /usr/local/bin/ffmpeg \ - && cp ffmpeg-*-amd64-static/ffprobe /usr/local/bin/ffprobe \ - && chmod +x /usr/local/bin/ffmpeg /usr/local/bin/ffprobe \ - && ffmpeg -version >/dev/null 2>&1 && ffprobe -version >/dev/null 2>&1 \ - && echo "[ffmpeg] binary valid" \ - && rm -rf ffmpeg-* # ---- 安装 Python 依赖 ---- WORKDIR /tmp @@ -120,13 +79,10 @@ RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debia # 安装最小运行时依赖(opencv-python-headless 需要 libglib2.0-0) RUN apt-get update && apt-get install -y --no-install-recommends \ + ffmpeg \ libglib2.0-0 \ && rm -rf /var/lib/apt/lists/* -# 从 builder 复制 ffmpeg 静态二进制 -COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg -COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe - # 从 builder 复制 Python 虚拟环境 COPY --from=builder /opt/venv /opt/venv