From 9e30b4871c28d1490e50e8d90233035b343efced Mon Sep 17 00:00:00 2001
From: Allison Karlitskaya <allison.karlitskaya@redhat.com>
Date: Wed, 4 Dec 2024 11:32:46 +0100
Subject: [PATCH] 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 <allison.karlitskaya@redhat.com>
---
 examples/bls/Containerfile | 2 +-
 examples/bls/build         | 5 +----
 examples/uki/Containerfile | 4 ++--
 examples/uki/build         | 5 +----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/examples/bls/Containerfile b/examples/bls/Containerfile
index 948ae38..545c797 100644
--- 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
index f889ffc..3089f70 100755
--- 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
index 95f5aa6..e9a890c 100644
--- 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
index 6af1a5c..6d40e16 100755
--- 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 .