From ffaaa92146feb241510a18f3a54939e9d93714b2 Mon Sep 17 00:00:00 2001 From: Pigway Date: Fri, 2 Oct 2026 00:50:59 +0800 Subject: [PATCH] Install verified font directly to avoid APT cache filename mismatch --- Dockerfile | 5 ++--- docs/NAS.md | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5fec410..54e9fd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,8 @@ RUN --mount=type=bind,source=build-cache/debs,target=/build-debs,readonly sed -i font_sha=$(apt-cache show "fonts-noto-cjk=$font_version" | awk '$1=="SHA256:" {print $2;exit}'); \ test -n "$font_sha"; \ echo "$font_sha /build-debs/fonts-noto-cjk.deb" | sha256sum -c -; \ - cp /build-debs/fonts-noto-cjk.deb "/var/cache/apt/archives/fonts-noto-cjk_${font_version#*:}_all.deb"; \ - fi \ - && apt-get install -y --no-install-recommends fonts-noto-cjk tzdata \ + apt-get install -y --no-install-recommends /build-debs/fonts-noto-cjk.deb tzdata; \ + else apt-get install -y --no-install-recommends fonts-noto-cjk tzdata; fi \ && rm -rf /var/lib/apt/lists/* \ && groupadd --gid 10333 frameflow && useradd --uid 10333 --gid 10333 --no-create-home frameflow \ && mkdir -p /data/images /data/generated /data/cache /config \ diff --git a/docs/NAS.md b/docs/NAS.md index a80ec18..563f150 100644 --- a/docs/NAS.md +++ b/docs/NAS.md @@ -121,7 +121,7 @@ from a trusted download machine. Verify its manifest, compressed blob SHA-256 an all uncompressed rootfs diff IDs before loading. With the verified local tag loaded: ```sh -sudo env DOCKER_BUILDKIT=0 /usr/local/bin/docker compose build \ +sudo env DOCKER_BUILDKIT=1 /usr/local/bin/docker compose build \ --build-arg PYTHON_BASE=python:3.14.5-slim-bookworm ```