From 89271e41ce0b21cfe04a44f82ad8587aacb0e91f Mon Sep 17 00:00:00 2001
From: Chris Reed <55092742+cjreed121@users.noreply.github.com>
Date: Fri, 12 Jul 2024 13:03:11 -0400
Subject: [PATCH] Separate org name from username

---
 .github/workflows/docker-build-push.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index daec7bb..ca33492 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -7,7 +7,7 @@ on:
         required: true
         type: boolean
         description: Whether to push the built images to Docker Hub
-      docker_username:
+      docker_org_name:
         required: true
         type: string
       base_commit:
@@ -17,6 +17,8 @@ on:
         required: true
         type: string
     secrets:
+      docker_username:
+        required: false
       docker_password:
         required: false
 
@@ -35,7 +37,7 @@ jobs:
         id: set-matrix
         uses: submitty/action-docker-matrix@v24.06.00
         with:
-          docker-username: ${{ inputs.docker_username }}
+          docker-username: ${{ inputs.docker_org_name }}
           base-commit: ${{ inputs.base_commit }}
           head-commit: ${{ inputs.head_commit }}
   docker:
@@ -57,7 +59,7 @@ jobs:
         uses: docker/login-action@releases/v1
         if: ${{ inputs.push }}
         with:
-          username: ${{ inputs.docker_username }}
+          username: ${{ secrets.docker_username }}
           password: ${{ secrets.docker_password }}
       - name: Build and push docker
         uses: docker/build-push-action@v4