From 0e7709c2f8745f7523617f144429134be97d77e9 Mon Sep 17 00:00:00 2001 From: Felicitas Pojtinger Date: Tue, 15 Oct 2024 19:20:57 -0700 Subject: [PATCH] refactor: Use `fuse-overlayfs` to support RPM builds with Btrfs Signed-off-by: Felicitas Pojtinger --- hydrapp/pkg/builders/rpm/Dockerfile | 2 +- hydrapp/pkg/builders/rpm/entrypoint.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hydrapp/pkg/builders/rpm/Dockerfile b/hydrapp/pkg/builders/rpm/Dockerfile index 6da151a27..2fd8f4cb4 100644 --- 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 index eb4867994..5f2155c08 100755 --- 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}"