From 512d32e285291c2b65e4bb458c27c22954a2a9a7 Mon Sep 17 00:00:00 2001
From: peet <peet@noctrl.eu>
Date: Fri, 24 Apr 2026 21:55:34 +0200
Subject: [PATCH] fix podman root

---
 podman-build-publish/action.yaml | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/podman-build-publish/action.yaml b/podman-build-publish/action.yaml
index 4b1e0d4..2c904e0 100644
--- a/podman-build-publish/action.yaml
+++ b/podman-build-publish/action.yaml
@@ -39,21 +39,16 @@ runs:
       run: |
         set -euo pipefail
 
-        # Keep Podman defaults aligned with runner build workflows.
+        # Fixed Podman storage paths — re-derived in each step to avoid
+        # relying on GITHUB_ENV propagation between composite action steps.
         podman_root="${RUNNER_TEMP}/podman-root"
         podman_runroot="${RUNNER_TEMP}/podman-runroot"
-        storage_driver="vfs"
-        build_isolation="chroot"
 
         rm -rf "${podman_root}" "${podman_runroot}"
         mkdir -p "${podman_root}" "${podman_runroot}"
 
-        # Export for use in subsequent steps
+        # Export only input-derived values that cannot be recomputed later.
         {
-          echo "PODMAN_ROOT=${podman_root}"
-          echo "PODMAN_RUNROOT=${podman_runroot}"
-          echo "STORAGE_DRIVER=${storage_driver}"
-          echo "BUILD_ISOLATION=${build_isolation}"
           echo "IMAGE_BASE=registry.noctrl.eu/${{ inputs.image-name }}"
         } >> "${GITHUB_ENV}"
 
@@ -73,9 +68,9 @@ runs:
         set -euo pipefail
 
         podman_args=(
-          --root "${PODMAN_ROOT}"
-          --runroot "${PODMAN_RUNROOT}"
-          --storage-driver "${STORAGE_DRIVER}"
+          --root "${RUNNER_TEMP}/podman-root"
+          --runroot "${RUNNER_TEMP}/podman-runroot"
+          --storage-driver vfs
         )
 
         echo "Logging in to registry: registry.noctrl.eu"
@@ -87,12 +82,12 @@ runs:
         set -euo pipefail
 
         podman_args=(
-          --root "${PODMAN_ROOT}"
-          --runroot "${PODMAN_RUNROOT}"
-          --storage-driver "${STORAGE_DRIVER}"
+          --root "${RUNNER_TEMP}/podman-root"
+          --runroot "${RUNNER_TEMP}/podman-runroot"
+          --storage-driver vfs
         )
 
-        build_cmd=(podman "${podman_args[@]}" build --isolation "${BUILD_ISOLATION}" -f "${{ inputs.containerfile }}")
+        build_cmd=(podman "${podman_args[@]}" build --isolation chroot -f "${{ inputs.containerfile }}")
 
         # Add build args
         while IFS= read -r build_arg; do
@@ -117,9 +112,9 @@ runs:
         set -euo pipefail
 
         podman_args=(
-          --root "${PODMAN_ROOT}"
-          --runroot "${PODMAN_RUNROOT}"
-          --storage-driver "${STORAGE_DRIVER}"
+          --root "${RUNNER_TEMP}/podman-root"
+          --runroot "${RUNNER_TEMP}/podman-runroot"
+          --storage-driver vfs
         )
 
         echo "Pushing image tags:"