From fe34667fdad11573c5a16badb2e2bbbc02a3650e Mon Sep 17 00:00:00 2001
From: Tim Etchells <tetchel@gmail.com>
Date: Mon, 13 Sep 2021 09:58:34 -0700
Subject: [PATCH] fix image namespace for new secrets structure

Signed-off-by: Tim Etchells <tetchel@gmail.com>
---
 .github/workflows/multiple-build.yaml   | 15 ++++++++-------
 .github/workflows/verify-login-push.yml |  5 +++--
 .github/workflows/verify-push.yaml      |  5 +++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/multiple-build.yaml b/.github/workflows/multiple-build.yaml
index 538b04c..540fc43 100644
--- a/.github/workflows/multiple-build.yaml
+++ b/.github/workflows/multiple-build.yaml
@@ -6,9 +6,10 @@ on:
     - cron: '0 0 * * *'  # every day at midnight
 
 env:
+  IMAGE_REGISTRY: quay.io
+  IMAGE_NAMESPACE: redhat-github-actions
   IMAGE_NAME: myimage
   IMAGE_TAG: v1
-  IMAGE_REGISTRY: quay.io
 
 jobs:
   build-only-podman:
@@ -43,7 +44,7 @@ jobs:
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ env.IMAGE_TAG }}
-          registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
+          registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
@@ -72,7 +73,7 @@ jobs:
 
       - name: Build image using Docker
         run: |
-            docker build -t ${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -<<EOF
+            docker build -t ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -<<EOF
             FROM busybox
             RUN echo "hello world"
             EOF
@@ -81,9 +82,9 @@ jobs:
         id: push
         uses: ./
         with:
-          image: ${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}
+          image: ${{ secrets.REGISTRY_USER }}
           tags: ${{ env.IMAGE_TAG }}
-          registry: ${{ env.IMAGE_REGISTRY }}
+          registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
@@ -130,7 +131,7 @@ jobs:
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ env.IMAGE_TAG }}
-          registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
+          registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
@@ -177,7 +178,7 @@ jobs:
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ env.IMAGE_TAG }}
-          registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
+          registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
diff --git a/.github/workflows/verify-login-push.yml b/.github/workflows/verify-login-push.yml
index 7b8999e..a659f92 100644
--- a/.github/workflows/verify-login-push.yml
+++ b/.github/workflows/verify-login-push.yml
@@ -9,8 +9,9 @@ on:
     - cron: '0 0 * * *'  # every day at midnight
 
 env:
-  IMAGE_NAME: myimage
   IMAGE_REGISTRY: quay.io
+  IMAGE_NAMESPACE: redhat-github-actions
+  IMAGE_NAME: myimage
   IMAGE_TAGS: v1 ${{ github.sha }}
 
 jobs:
@@ -66,7 +67,7 @@ jobs:
         with:
           image: ${{ steps.build_image.outputs.image }}
           tags: ${{ steps.build_image.outputs.tags }}
-          registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
+          registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
           extra-args: |
             --disable-content-trust
 
diff --git a/.github/workflows/verify-push.yaml b/.github/workflows/verify-push.yaml
index 0179454..50845df 100644
--- a/.github/workflows/verify-push.yaml
+++ b/.github/workflows/verify-push.yaml
@@ -10,8 +10,9 @@ on:
 
 env:
   PROJECT_DIR: spring-petclinic
-  IMAGE_NAME: spring-petclinic
   IMAGE_REGISTRY: quay.io
+  IMAGE_NAMESPACE: redhat-github-actions
+  IMAGE_NAME: spring-petclinic
   IMAGE_TAGS: v1 ${{ github.sha }}
   MVN_REPO_DIR: ~/.m2/repository
 
@@ -104,7 +105,7 @@ jobs:
         with:
           image: ${{ steps.build_image.outputs.image }}
           tags: ${{ steps.build_image.outputs.tags }}
-          registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
+          registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
           extra-args: |