From fa3f8947368d6455503c8fefed6dad3e6d20a30a Mon Sep 17 00:00:00 2001
From: peet <peet@noctrl.eu>
Date: Thu, 28 May 2026 14:42:29 +0200
Subject: [PATCH] podman storage driver overlayfs+fuse and vfs as fallback

---
 podman-build-publish/action.yaml    | 53 +++++++++++++++++++++++++++--
 podman-manifest-publish/action.yaml | 44 ++++++++++++++++++++++--
 2 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/podman-build-publish/action.yaml b/podman-build-publish/action.yaml
index 49b9314..e06b4a8 100644
--- a/podman-build-publish/action.yaml
+++ b/podman-build-publish/action.yaml
@@ -49,6 +49,32 @@ runs:
         rm -rf "${RUNNER_TEMP}/podman-root" "${RUNNER_TEMP}/podman-runroot"
         mkdir -p "${RUNNER_TEMP}/podman-root" "${RUNNER_TEMP}/podman-runroot"
 
+        podman_base_args=(
+          --root "${RUNNER_TEMP}/podman-root"
+          --runroot "${RUNNER_TEMP}/podman-runroot"
+        )
+
+        selected_driver="vfs"
+        selected_storage_opt=""
+
+        # Prefer overlay with fuse-overlayfs when available and functional.
+        if [[ -c /dev/fuse ]] && command -v fuse-overlayfs >/dev/null 2>&1; then
+          fuse_path="$(command -v fuse-overlayfs)"
+          candidate_storage_opt="overlay.mount_program=${fuse_path}"
+          if podman "${podman_base_args[@]}" --storage-driver overlay --storage-opt "${candidate_storage_opt}" info >/dev/null 2>&1; then
+            selected_driver="overlay"
+            selected_storage_opt="${candidate_storage_opt}"
+            echo "Using overlay storage driver with fuse-overlayfs (${fuse_path})."
+          else
+            echo "overlay+fuse-overlayfs probe failed; falling back to vfs."
+          fi
+        else
+          echo "overlay+fuse prerequisites missing; using vfs."
+        fi
+
+        echo "PODMAN_STORAGE_DRIVER=${selected_driver}" >> "${GITHUB_ENV}"
+        echo "PODMAN_STORAGE_OPT=${selected_storage_opt}" >> "${GITHUB_ENV}"
+
         # Validate tags early so failures are caught before build starts
         mapfile -t tags < <(printf '%s\n' "${{ inputs.tags }}" | tr ', ' '\n\n' | sed '/^$/d')
         if [[ ${#tags[@]} -eq 0 ]]; then
@@ -61,12 +87,19 @@ runs:
       run: |
         set -euo pipefail
 
+        : "${PODMAN_STORAGE_DRIVER:=vfs}"
+        : "${PODMAN_STORAGE_OPT:=}"
+
         podman_args=(
           --root "${RUNNER_TEMP}/podman-root"
           --runroot "${RUNNER_TEMP}/podman-runroot"
-          --storage-driver vfs
+          --storage-driver "${PODMAN_STORAGE_DRIVER}"
         )
 
+        if [[ -n "${PODMAN_STORAGE_OPT}" ]]; then
+          podman_args+=(--storage-opt "${PODMAN_STORAGE_OPT}")
+        fi
+
         echo "Logging in to registry: registry.noctrl.eu"
         echo "${{ inputs.registry-password }}" | podman "${podman_args[@]}" login registry.noctrl.eu -u "${{ inputs.registry-username }}" --password-stdin
 
@@ -75,12 +108,19 @@ runs:
       run: |
         set -euo pipefail
 
+        : "${PODMAN_STORAGE_DRIVER:=vfs}"
+        : "${PODMAN_STORAGE_OPT:=}"
+
         podman_args=(
           --root "${RUNNER_TEMP}/podman-root"
           --runroot "${RUNNER_TEMP}/podman-runroot"
-          --storage-driver vfs
+          --storage-driver "${PODMAN_STORAGE_DRIVER}"
         )
 
+        if [[ -n "${PODMAN_STORAGE_OPT}" ]]; then
+          podman_args+=(--storage-opt "${PODMAN_STORAGE_OPT}")
+        fi
+
         image_base="registry.noctrl.eu/${{ inputs.image-name }}"
         build_cmd=(podman "${podman_args[@]}" build --isolation chroot -f "${{ inputs.containerfile }}")
 
@@ -107,12 +147,19 @@ runs:
       run: |
         set -euo pipefail
 
+        : "${PODMAN_STORAGE_DRIVER:=vfs}"
+        : "${PODMAN_STORAGE_OPT:=}"
+
         podman_args=(
           --root "${RUNNER_TEMP}/podman-root"
           --runroot "${RUNNER_TEMP}/podman-runroot"
-          --storage-driver vfs
+          --storage-driver "${PODMAN_STORAGE_DRIVER}"
         )
 
+        if [[ -n "${PODMAN_STORAGE_OPT}" ]]; then
+          podman_args+=(--storage-opt "${PODMAN_STORAGE_OPT}")
+        fi
+
         image_base="registry.noctrl.eu/${{ inputs.image-name }}"
 
         echo "Pushing image tags:"
diff --git a/podman-manifest-publish/action.yaml b/podman-manifest-publish/action.yaml
index 15e4c53..219d2c4 100644
--- a/podman-manifest-publish/action.yaml
+++ b/podman-manifest-publish/action.yaml
@@ -32,6 +32,32 @@ runs:
         rm -rf "${RUNNER_TEMP}/podman-root" "${RUNNER_TEMP}/podman-runroot"
         mkdir -p "${RUNNER_TEMP}/podman-root" "${RUNNER_TEMP}/podman-runroot"
 
+        podman_base_args=(
+          --root "${RUNNER_TEMP}/podman-root"
+          --runroot "${RUNNER_TEMP}/podman-runroot"
+        )
+
+        selected_driver="vfs"
+        selected_storage_opt=""
+
+        # Prefer overlay with fuse-overlayfs when available and functional.
+        if [[ -c /dev/fuse ]] && command -v fuse-overlayfs >/dev/null 2>&1; then
+          fuse_path="$(command -v fuse-overlayfs)"
+          candidate_storage_opt="overlay.mount_program=${fuse_path}"
+          if podman "${podman_base_args[@]}" --storage-driver overlay --storage-opt "${candidate_storage_opt}" info >/dev/null 2>&1; then
+            selected_driver="overlay"
+            selected_storage_opt="${candidate_storage_opt}"
+            echo "Using overlay storage driver with fuse-overlayfs (${fuse_path})."
+          else
+            echo "overlay+fuse-overlayfs probe failed; falling back to vfs."
+          fi
+        else
+          echo "overlay+fuse prerequisites missing; using vfs."
+        fi
+
+        echo "PODMAN_STORAGE_DRIVER=${selected_driver}" >> "${GITHUB_ENV}"
+        echo "PODMAN_STORAGE_OPT=${selected_storage_opt}" >> "${GITHUB_ENV}"
+
         mapfile -t source_tags < <(printf '%s\n' "${{ inputs.source-tags }}" | tr ', ' '\n\n' | sed '/^$/d')
         if [[ ${#source_tags[@]} -eq 0 ]]; then
           echo "ERROR: no tags resolved from inputs.source-tags" >&2
@@ -43,12 +69,19 @@ runs:
       run: |
         set -euo pipefail
 
+        : "${PODMAN_STORAGE_DRIVER:=vfs}"
+        : "${PODMAN_STORAGE_OPT:=}"
+
         podman_args=(
           --root "${RUNNER_TEMP}/podman-root"
           --runroot "${RUNNER_TEMP}/podman-runroot"
-          --storage-driver vfs
+          --storage-driver "${PODMAN_STORAGE_DRIVER}"
         )
 
+        if [[ -n "${PODMAN_STORAGE_OPT}" ]]; then
+          podman_args+=(--storage-opt "${PODMAN_STORAGE_OPT}")
+        fi
+
         echo "Logging in to registry: registry.noctrl.eu"
         echo "${{ inputs.registry-password }}" | podman "${podman_args[@]}" login registry.noctrl.eu -u "${{ inputs.registry-username }}" --password-stdin
 
@@ -57,12 +90,19 @@ runs:
       run: |
         set -euo pipefail
 
+        : "${PODMAN_STORAGE_DRIVER:=vfs}"
+        : "${PODMAN_STORAGE_OPT:=}"
+
         podman_args=(
           --root "${RUNNER_TEMP}/podman-root"
           --runroot "${RUNNER_TEMP}/podman-runroot"
-          --storage-driver vfs
+          --storage-driver "${PODMAN_STORAGE_DRIVER}"
         )
 
+        if [[ -n "${PODMAN_STORAGE_OPT}" ]]; then
+          podman_args+=(--storage-opt "${PODMAN_STORAGE_OPT}")
+        fi
+
         image_base="registry.noctrl.eu/${{ inputs.image-name }}"
         target_ref="docker://${image_base}:${{ inputs.manifest-tag }}"
         manifest_name="manifest-${{ github.run_id }}-${{ github.job }}"