From e3ecb36bd4d9d4956e4be57856822988aa7ba897 Mon Sep 17 00:00:00 2001
From: jakeymac <jakeymacaroni@gmail.com>
Date: Fri, 22 Aug 2025 16:13:59 -0600
Subject: [PATCH 1/3] Fix issue in organization/repo names with invalid
 characters

---
 .github/workflows/build.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7be2e37..bbec046 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,9 +23,6 @@ env:
   HELM_KEY_PASSPHRASE: ${{ secrets.HELM_KEY_PASSPHRASE }}
   HELM_REPO_PASSWORD: ${{ secrets.HELM_REPO_PASSWORD }}
 
-  CI_REGISTRY: ghcr.io
-  CI_REGISTRY_IMAGE: ghcr.io/${{ github.repository }}
-
   CI_COMMIT_SHORT_SHA: ${{ github.sha }}
 
   ECCR_USER: ${{ secrets.ECCR_USER }}
@@ -112,6 +109,21 @@ jobs:
           username: ${{ env.ECCR_USER }}
           password: ${{ env.ECCR_PASSWORD }}
 
+      - name: Sanitize Registry for GHCR
+        run: |
+          OWNER_NAME_RAW="${{ github.repository_owner }}"
+          REPO_NAME_RAW="${{ github.event.repository.name }}"
+
+          # Convert to lower case
+          OWNER_LOWER=$(echo "$OWNER_NAME_RAW" | tr '[:upper:]' '[:lower:]')
+          REPO_LOWER=$(echo "$REPO_NAME_RAW"  | tr '[:upper:]' '[:lower:]')
+
+          # Replace invalid characters with '-'
+          OWNER_SAFE=$(echo "$OWNER_LOWER" | sed -E 's/[^a-z0-9._-]+/-/g')
+          REPO_SAFE=$(echo "$REPO_LOWER"  | sed -E 's/[^a-z0-9._-]+/-/g')
+
+          echo "CI_REGISTRY_IMAGE=ghcr.io/${OWNER_SAFE}/${REPO_SAFE}" >> "$GITHUB_ENV"
+  
       - name: Set Kaniko Build Variables
         if: (matrix.build_type == 'tag' && startsWith(github.ref, 'refs/tags/')) || (matrix.build_type == 'stable' && github.ref_name == 'master')
         run: |

From 133ab2e36e58f1527ae24e4f2d2841e10c5b411d Mon Sep 17 00:00:00 2001
From: Michael Souffront <17328135+msouff@users.noreply.github.com>
Date: Mon, 25 Aug 2025 08:35:20 -0600
Subject: [PATCH 2/3] simplified registry var step

---
 .github/workflows/build.yml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bbec046..ea1e8c5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -109,20 +109,8 @@ jobs:
           username: ${{ env.ECCR_USER }}
           password: ${{ env.ECCR_PASSWORD }}
 
-      - name: Sanitize Registry for GHCR
-        run: |
-          OWNER_NAME_RAW="${{ github.repository_owner }}"
-          REPO_NAME_RAW="${{ github.event.repository.name }}"
-
-          # Convert to lower case
-          OWNER_LOWER=$(echo "$OWNER_NAME_RAW" | tr '[:upper:]' '[:lower:]')
-          REPO_LOWER=$(echo "$REPO_NAME_RAW"  | tr '[:upper:]' '[:lower:]')
-
-          # Replace invalid characters with '-'
-          OWNER_SAFE=$(echo "$OWNER_LOWER" | sed -E 's/[^a-z0-9._-]+/-/g')
-          REPO_SAFE=$(echo "$REPO_LOWER"  | sed -E 's/[^a-z0-9._-]+/-/g')
-
-          echo "CI_REGISTRY_IMAGE=ghcr.io/${OWNER_SAFE}/${REPO_SAFE}" >> "$GITHUB_ENV"
+      - name: Add Registry to Env
+        run: echo "CI_REGISTRY_IMAGE=ghcr.io/${github.repository,,}" >> "$GITHUB_ENV"
   
       - name: Set Kaniko Build Variables
         if: (matrix.build_type == 'tag' && startsWith(github.ref, 'refs/tags/')) || (matrix.build_type == 'stable' && github.ref_name == 'master')

From 2479137241f40a8cb997d8f3e2b6e21a549778c1 Mon Sep 17 00:00:00 2001
From: Michael Souffront <17328135+msouff@users.noreply.github.com>
Date: Mon, 25 Aug 2025 08:40:24 -0600
Subject: [PATCH 3/3] updated repo var to bashform

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea1e8c5..02559cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -110,7 +110,7 @@ jobs:
           password: ${{ env.ECCR_PASSWORD }}
 
       - name: Add Registry to Env
-        run: echo "CI_REGISTRY_IMAGE=ghcr.io/${github.repository,,}" >> "$GITHUB_ENV"
+        run: echo "CI_REGISTRY_IMAGE=ghcr.io/${GITHUB_REPOSITORY,,}" >> "$GITHUB_ENV"
   
       - name: Set Kaniko Build Variables
         if: (matrix.build_type == 'tag' && startsWith(github.ref, 'refs/tags/')) || (matrix.build_type == 'stable' && github.ref_name == 'master')