From 05d7c87d159aeebeeba5ec8af2835881acc8fe8f Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Fri, 13 Mar 2026 19:21:31 -0400
Subject: [PATCH] fix: Generating ISO from recipe

---
 .github/workflows/test.yml | 78 +++++++++++++++++++++++++++++++++++++-
 justfile                   | 20 ++++++++++
 2 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 437053ea..2a61aacb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -669,6 +669,44 @@ jobs:
           COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }}
         run: just test-generate-iso-image
 
+  iso-from-image-podman:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read # read repo contents
+      packages: write # write test package to ghcr
+      id-token: write # docker auth
+
+    steps:
+      - name: Maximize build space
+        uses: ublue-os/remove-unwanted-software@cc0becac701cf642c8f0a6613bbdaf5dc36b259e # v9
+
+      - uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        with:
+          install: true
+
+      - uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
+
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+          ref: ${{ inputs.ref }}
+          repository: ${{ inputs.repo }}
+
+
+      - uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
+
+      - name: Run Build
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }}
+          COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }}
+        run: just test-generate-iso-image-podman
+
   iso-from-image-web-ui:
     timeout-minutes: 60
     runs-on: ubuntu-latest
@@ -743,7 +781,45 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }}
           COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }}
-        run: just test-generate-iso-image
+        run: just test-generate-iso-recipe
+
+  iso-from-recipe-podman:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read # read repo contents
+      packages: write # write test package to ghcr
+      id-token: write # docker auth
+
+    steps:
+      - name: Maximize build space
+        uses: ublue-os/remove-unwanted-software@cc0becac701cf642c8f0a6613bbdaf5dc36b259e # v9
+
+      - uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        with:
+          install: true
+
+      - uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
+
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+          ref: ${{ inputs.ref }}
+          repository: ${{ inputs.repo }}
+
+
+      - uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
+
+      - name: Run Build
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }}
+          COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }}
+        run: just test-generate-iso-recipe-podman
 
   container-podman-build:
     timeout-minutes: 60
diff --git a/justfile b/justfile
index f99f0288..31cf34e6 100644
--- a/justfile
+++ b/justfile
@@ -303,6 +303,15 @@ test-generate-iso-image: generate-test-secret install-debug-all-features
   set -eu
   ISO_OUT=$(mktemp -d)
   bluebuild generate-iso -vv --output-dir "$ISO_OUT" image ghcr.io/blue-build/cli/test:latest
+  rm -fr "$ISO_OUT"
+
+# Run ISO generator for images with podman
+test-generate-iso-image-podman: generate-test-secret install-debug-all-features
+  #!/usr/bin/env bash
+  set -eu
+  ISO_OUT=$(mktemp -d)
+  bluebuild generate-iso -B podman -vv --output-dir "$ISO_OUT" image ghcr.io/blue-build/cli/test:latest
+  rm -fr "$ISO_OUT"
 
 # Run ISO generator for images using web-ui
 test-generate-iso-web-ui: generate-test-secret install-debug-all-features
@@ -310,6 +319,7 @@ test-generate-iso-web-ui: generate-test-secret install-debug-all-features
   set -eu
   ISO_OUT=$(mktemp -d)
   bluebuild generate-iso -vv --output-dir "$ISO_OUT" --web-ui image ghcr.io/blue-build/cli/test:latest
+  rm -fr "$ISO_OUT"
 
 # Run ISO generator for images
 test-generate-iso-recipe: generate-test-secret install-debug-all-features
@@ -318,6 +328,16 @@ test-generate-iso-recipe: generate-test-secret install-debug-all-features
   ISO_OUT=$(mktemp -d)
   cd integration-tests/test-repo
   bluebuild generate-iso -vv --output-dir "$ISO_OUT" recipe recipes/recipe.yml
+  rm -fr "$ISO_OUT"
+
+# Run ISO generator for images with podman
+test-generate-iso-recipe-podman: generate-test-secret install-debug-all-features
+  #!/usr/bin/env bash
+  set -eu
+  ISO_OUT=$(mktemp -d)
+  cd integration-tests/test-repo
+  bluebuild generate-iso -B podman -vv --output-dir "$ISO_OUT" recipe recipes/recipe.yml
+  rm -fr "$ISO_OUT"
 
 # Build a local cli image
 build-local-cli-image: