From 9e3911e3dcaae9fc5ab48739a7f84763cec4d167 Mon Sep 17 00:00:00 2001
From: Jarno Rankinen <jarno@oranki.net>
Date: Sun, 11 Aug 2024 18:54:44 +0300
Subject: [PATCH] Attempt #2 at using a newer ubuntu for build

- Try to fix invalid mount type "bind" for 'RUN --mount'
---
 .github/workflows/build.yml | 2 +-
 Containerfile               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 38b0a8f..8333b9d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   build_push_aurora:
     name: Build and publish SB image with ZFS
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read
diff --git a/Containerfile b/Containerfile
index 7994ddc..2a8dc8b 100644
--- a/Containerfile
+++ b/Containerfile
@@ -59,7 +59,8 @@ FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${SOURCE_TAG}
 
 COPY build.sh /tmp/build.sh
 
-RUN --mount=type=bind,from=kernel-cache,src=/tmp/rpms,dst=/tmp/rpms/kernel \
+RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
+    --mount=type=bind,from=kernel-cache,src=/tmp/rpms,dst=/tmp/rpms/kernel \
     --mount=type=bind,from=zfs-cache,src=/rpms/kmods/zfs,dst=/tmp/rpms/zfs \
     mkdir -p /var/lib/alternatives && \
     /tmp/build.sh && \