From 018c2ad07a58027fa79e8ef3417034cefb25d9bf Mon Sep 17 00:00:00 2001
From: Benjamin Auquite <halomastar@gmail.com>
Date: Fri, 2 May 2025 03:52:11 -0500
Subject: [PATCH] Update deploy_docker_ghcr.yml

---
 .github/workflows/deploy_docker_ghcr.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy_docker_ghcr.yml b/.github/workflows/deploy_docker_ghcr.yml
index d410b12..dc2f9c5 100644
--- a/.github/workflows/deploy_docker_ghcr.yml
+++ b/.github/workflows/deploy_docker_ghcr.yml
@@ -21,23 +21,34 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Set credential variables
+        id: credentials
+        run: |
+          echo "DOCKER_USERNAME=$(echo ${DOCKER_USERNAME:-${{ secrets.DOCKER_USERNAME }} })" >> $GITHUB_OUTPUT
+          echo "DOCKER_PASSWORD=$(echo ${DOCKER_PASSWORD:-${{ secrets.DOCKER_PASSWORD }}:-${{ secrets.DOCKER_TOKEN }}:-${{ env.DOCKER_TOKEN }} })" >> $GITHUB_OUTPUT
+          if [ -n "$(echo ${DOCKER_USERNAME:-${{ secrets.DOCKER_USERNAME }} })" ]; then 
+            echo "HAS_DOCKER_CREDS=true" >> $GITHUB_OUTPUT
+          else
+            echo "HAS_DOCKER_CREDS=false" >> $GITHUB_OUTPUT
+          fi
+
       - name: Docker metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ secrets.DOCKER_USERNAME || env.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}
+            ${{ steps.credentials.outputs.DOCKER_USERNAME != '' && format('{0}/{1}', steps.credentials.outputs.DOCKER_USERNAME, env.IMAGE_NAME) || '' }}
             ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
           tags: |
             type=raw,value=latest
             type=sha,format=short
 
       - name: Login to DockerHub
-        if: ${{ secrets.DOCKER_USERNAME || env.DOCKER_USERNAME }}
+        if: steps.credentials.outputs.HAS_DOCKER_CREDS == 'true'
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME || env.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD || env.DOCKER_PASSWORD || secrets.DOCKER_TOKEN || env.DOCKER_TOKEN }}
+          username: ${{ steps.credentials.outputs.DOCKER_USERNAME }}
+          password: ${{ steps.credentials.outputs.DOCKER_PASSWORD }}
         continue-on-error: true
 
       - name: Login to GitHub Container Registry
@@ -45,7 +56,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN || github.token }}
+          password: ${{ github.token }}
         continue-on-error: true
 
       - name: Build and push