From 3d18cc47a8a1a4ce1126d4b538762289b95d629d Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Mon, 25 Aug 2025 10:18:56 -0400
Subject: [PATCH 1/2] Ensure Github Actions trigger on EL9 image changes

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
---
 .github/workflows/build.yaml   | 2 ++
 dockerfiles/dnf/Dockerfile.el9 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 786a3d5..a9c7872 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,6 +6,7 @@ on:
             - main
         paths:
             - 'dockerfiles/dnf/Dockerfile'
+            - 'dockerfiles/dnf/Dockerfile.el9'
         tags:
             - 'v*.*.*'
     pull_request:
@@ -13,6 +14,7 @@ on:
             - main
         paths:
             - 'dockerfiles/dnf/Dockerfile'
+            - 'dockerfiles/dnf/Dockerfile.el9'
     workflow_dispatch:
 
 jobs:
diff --git a/dockerfiles/dnf/Dockerfile.el9 b/dockerfiles/dnf/Dockerfile.el9
index 77614a7..24e0dfc 100644
--- a/dockerfiles/dnf/Dockerfile.el9
+++ b/dockerfiles/dnf/Dockerfile.el9
@@ -13,7 +13,7 @@ RUN dnf install -y \
         fuse-overlayfs \
         tar \
         squashfs-tools \
-	fuse-overlayfs
+        fuse-overlayfs
 
 # Ensure python3 shebang uses Python 3.11
 RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1 && \

From c0991ac74ad37ffd834688cbb1dcd87a2af98591 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Mon, 25 Aug 2025 12:03:05 -0400
Subject: [PATCH 2/2] Do not push for forks

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
---
 .github/workflows/build.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a9c7872..449e255 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -55,6 +55,11 @@ jobs:
             TAG="test"
           fi
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          if [[ "${{ github.repository_owner }}" == "openchami" ]]; then
+            echo "push=true" >> $GITHUB_OUTPUT
+          else
+            echo "push=false" >> $GITHUB_OUTPUT
+          fi
           echo "Computed tag: ${TAG}"
       
       - name: Build and push Docker image
@@ -64,7 +69,7 @@ jobs:
         with:
           context: .
           file: dockerfiles/dnf/Dockerfile
-          push: true
+          push: ${{ steps.set_tag.outputs.push }}
           tags: ghcr.io/openchami/image-build:${{ steps.set_tag.outputs.tag }}
 
       - name: Build and push Docker image (EL9)
@@ -74,7 +79,7 @@ jobs:
         with:
           context: .
           file: dockerfiles/dnf/Dockerfile.el9
-          push: true
+          push: ${{ steps.set_tag.outputs.push }}
           tags: ghcr.io/openchami/image-build-el9:${{ steps.set_tag.outputs.tag }}
 
       - name: Generate release notes