Install verified font directly to avoid APT cache filename mismatch
This commit is contained in:
+2
-3
@@ -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}'); \
|
font_sha=$(apt-cache show "fonts-noto-cjk=$font_version" | awk '$1=="SHA256:" {print $2;exit}'); \
|
||||||
test -n "$font_sha"; \
|
test -n "$font_sha"; \
|
||||||
echo "$font_sha /build-debs/fonts-noto-cjk.deb" | sha256sum -c -; \
|
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"; \
|
apt-get install -y --no-install-recommends /build-debs/fonts-noto-cjk.deb tzdata; \
|
||||||
fi \
|
else apt-get install -y --no-install-recommends fonts-noto-cjk tzdata; fi \
|
||||||
&& apt-get install -y --no-install-recommends fonts-noto-cjk tzdata \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& groupadd --gid 10333 frameflow && useradd --uid 10333 --gid 10333 --no-create-home frameflow \
|
&& groupadd --gid 10333 frameflow && useradd --uid 10333 --gid 10333 --no-create-home frameflow \
|
||||||
&& mkdir -p /data/images /data/generated /data/cache /config \
|
&& mkdir -p /data/images /data/generated /data/cache /config \
|
||||||
|
|||||||
+1
-1
@@ -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:
|
all uncompressed rootfs diff IDs before loading. With the verified local tag loaded:
|
||||||
|
|
||||||
```sh
|
```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
|
--build-arg PYTHON_BASE=python:3.14.5-slim-bookworm
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user