examples: step up our caching game

This is the way it should have been done from the start, but I didn't know about it at the time. Also, add a bug reference for an unrelated workaround. Signed-off-by: Allison Karlitskaya <[email protected]>
containers · Dec 5, 2024 · 9e30b48 · 9e30b48
1 parent 2da53b2
commit 9e30b48
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/examples/bls/Containerfile b/examples/bls/Containerfile
@@ -2,7 +2,7 @@
 FROM fedora:rawhide
 COPY extra /
 COPY cfsctl /usr/bin
-RUN <<EOF
+RUN --mount=type=cache,target=/var/cache/libdnf5 <<EOF
     set -eux
     dnf --setopt keepcache=1 install -y systemd util-linux skopeo composefs strace dosfstools kernel
     systemctl enable systemd-networkd

diff --git a/examples/bls/build b/examples/bls/build
@@ -4,12 +4,9 @@ set -eux
 
 cd "${0%/*}"
 
+# https://github.com/containers/buildah/issues/5656
 PODMAN_BUILD="podman build --no-cache"
 
-if [ -d ~/.cache/container-build-cache ]; then
-    PODMAN_BUILD="${PODMAN_BUILD} --security-opt=label=disable --volume=${HOME}/.cache/container-build-cache:/var/cache:U"
-fi
-
 cargo build --release
 
 cp ../../target/release/cfsctl .

diff --git a/examples/uki/Containerfile b/examples/uki/Containerfile
@@ -17,7 +17,7 @@
 FROM fedora:rawhide AS base
 COPY extra /
 COPY cfsctl /usr/bin
-RUN <<EOF
+RUN --mount=type=cache,target=/var/cache/libdnf5 <<EOF
     set -eux
     # we should install kernel-modules here, but can't
     # because it'll pull in the entire kernel with it
@@ -39,7 +39,7 @@ EOF
 
 FROM base AS kernel
 ARG COMPOSEFS_FSVERITY
-RUN <<EOF
+RUN --mount=type=cache,target=/var/cache/libdnf5 <<EOF
     set -eux
     mkdir -p /etc/kernel /etc/dracut.conf.d
     echo "composefs=${COMPOSEFS_FSVERITY} rw" > /etc/kernel/cmdline

diff --git a/examples/uki/build b/examples/uki/build
@@ -4,12 +4,9 @@ set -eux
 
 cd "${0%/*}"
 
+# https://github.com/containers/buildah/issues/5656
 PODMAN_BUILD="podman build --no-cache"
 
-if [ -d ~/.cache/container-build-cache ]; then
-    PODMAN_BUILD="${PODMAN_BUILD} --security-opt=label=disable --volume=${HOME}/.cache/container-build-cache:/var/cache:U"
-fi
-
 cargo build --release
 
 cp ../../target/release/cfsctl .