refactor: Use fuse-overlayfs to support RPM builds with Btrfs

Signed-off-by: Felicitas Pojtinger <felicitas@pojtinger.com>
pojntfx · Oct 16, 2024 · 0e7709c · 0e7709c
1 parent 369c576
commit 0e7709c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/hydrapp/pkg/builders/rpm/Dockerfile b/hydrapp/pkg/builders/rpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM fedora:40
 
 # Install native dependencies
-RUN dnf install -y fedora-packager @development-tools qemu-user-static rpm-sign
+RUN dnf install -y fedora-packager @development-tools qemu-user-static rpm-sign fuse-overlayfs
 
 RUN git config --global --add safe.directory '*'
 

diff --git a/hydrapp/pkg/builders/rpm/entrypoint.sh b/hydrapp/pkg/builders/rpm/entrypoint.sh
@@ -20,6 +20,9 @@ export BASEDIR="${PWD}/${GOMAIN}"
 echo "%_signature gpg
 %_gpg_name $(echo ${PGP_KEY_ID} | base64 -d)" >"${HOME}/.rpmmacros"
 
+# Use `fuse-overlayfs` to allow using Docker in Docker for builds
+sed -i 's/#mount_program/mount_program/' /usr/share/containers/storage.conf
+
 # Build tarball and source package
 export PACKAGE="${APP_ID}-${PACKAGE_VERSION}"
 export SUFFIX="${BRANCH_TIMESTAMP_UNIX}.${PACKAGE_SUFFIX}"