From 4e07cd57aacc7fef61e9e3f83c13e6478c2eef95 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 21 Jan 2026 20:56:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=BE=A9=20bookworm=20?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=20dasel=20=E5=92=8C=20resvg=20=E5=A5=97?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 從 apt-get install 移除 dasel 和 resvg - 改用 GitHub releases 下載二進位檔案 - dasel v2.8.1 支援 amd64/arm64 - resvg v0.44.0 支援 amd64/arm64 --- Dockerfile | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8126f43..8491574 100644 --- a/Dockerfile +++ b/Dockerfile @@ -110,9 +110,9 @@ RUN apt-get update --fix-missing && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* # 階段 2:核心轉換工具(小型) +# 注意:dasel 和 resvg 在 bookworm 中不存在,後續用二進位檔案安裝 RUN apt-get update --fix-missing && apt-get install -y --no-install-recommends \ assimp-utils \ - dasel \ dcraw \ dvisvgm \ ghostscript \ @@ -120,9 +120,31 @@ RUN apt-get update --fix-missing && apt-get install -y --no-install-recommends \ mupdf-tools \ poppler-utils \ potrace \ - resvg \ && rm -rf /var/lib/apt/lists/* +# 階段 2.1:安裝 dasel(從 GitHub 下載二進位檔案) +RUN ARCH=$(uname -m) && \ + if [ "$ARCH" = "aarch64" ]; then \ + DASEL_ARCH="linux_arm64"; \ + else \ + DASEL_ARCH="linux_amd64"; \ + fi && \ + curl -sSLf "https://github.com/TomWright/dasel/releases/download/v2.8.1/dasel_${DASEL_ARCH}" -o /usr/local/bin/dasel && \ + chmod +x /usr/local/bin/dasel + +# 階段 2.2:安裝 resvg(從 GitHub 下載二進位檔案) +RUN ARCH=$(uname -m) && \ + if [ "$ARCH" = "aarch64" ]; then \ + RESVG_ARCH="aarch64-unknown-linux-gnu"; \ + else \ + RESVG_ARCH="x86_64-unknown-linux-gnu"; \ + fi && \ + curl -sSLf "https://github.com/RazrFalcon/resvg/releases/download/v0.44.0/resvg-${RESVG_ARCH}.tar.gz" -o /tmp/resvg.tar.gz && \ + tar -xzf /tmp/resvg.tar.gz -C /tmp/ && \ + mv /tmp/resvg /usr/local/bin/resvg && \ + chmod +x /usr/local/bin/resvg && \ + rm -rf /tmp/resvg.tar.gz /tmp/resvg-* + # 階段 3:影音處理工具 RUN apt-get update --fix-missing && apt-get install -y --no-install-recommends \ ffmpeg \