From b23ac731bebe6a97dbdd294eebd46ad5f67cfe71 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Wed, 24 Sep 2025 10:15:05 -0400
Subject: [PATCH] Registry login tweaks.

---
 .gitea/workflows/pr-docker-deploy.yml   | 54 ++++++++++++++++---------
 .gitea/workflows/renovate-pr-deploy.yml | 27 ++++++++-----
 2 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml
index 8d83af2..c71574d 100644
--- a/.gitea/workflows/pr-docker-deploy.yml
+++ b/.gitea/workflows/pr-docker-deploy.yml
@@ -150,18 +150,25 @@ jobs:
       #   run: |
       #     docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf
 
-      - name: Login to registries
+      - name: Login to Docker Hub
         uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
-          registry-auth: |
-            - username: ${{ secrets.DOCKERHUB_USER }}
-              password: ${{ secrets.DOCKERHUB_PASSWORD }}
-            - registry: ghcr.io
-              username: ${{ secrets.GHCR_USER }}
-              password: ${{ secrets.GHCR_LOGIN_TOKEN }}
-            - registry: git.trez.wtf
-              username: ${{ secrets.BOT_GITEA_USER }}
-              password: ${{ secrets.BOT_GITEA_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GHCR_USER }}
+          password: ${{ secrets.GHCR_LOGIN_TOKEN }}
+
+      - name: Login to Private Gitea Registry
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          registry: git.trez.wtf
+          username: ${{ secrets.BOT_GITEA_USER }}
+          password: ${{ secrets.BOT_GITEA_PASSWORD }}
 
       - name: Cache Vault install
         id: cache-vault
@@ -339,18 +346,25 @@ jobs:
       #   run: |
       #     docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf
 
-      - name: Login to registries
+      - name: Login to Docker Hub
         uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
-          registry-auth: |
-            - username: ${{ secrets.DOCKERHUB_USER }}
-              password: ${{ secrets.DOCKERHUB_PASSWORD }}
-            - registry: ghcr.io
-              username: ${{ secrets.GHCR_USER }}
-              password: ${{ secrets.GHCR_LOGIN_TOKEN }}
-            - registry: git.trez.wtf
-              username: ${{ secrets.BOT_GITEA_USER }}
-              password: ${{ secrets.BOT_GITEA_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GHCR_USER }}
+          password: ${{ secrets.GHCR_LOGIN_TOKEN }}
+
+      - name: Login to Private Gitea Registry
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          registry: git.trez.wtf
+          username: ${{ secrets.BOT_GITEA_USER }}
+          password: ${{ secrets.BOT_GITEA_PASSWORD }}
 
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml
index 0b0e2ba..5561a43 100644
--- a/.gitea/workflows/renovate-pr-deploy.yml
+++ b/.gitea/workflows/renovate-pr-deploy.yml
@@ -98,18 +98,25 @@ jobs:
           notification_title: "GITEA: [RENOVATE] Docker Compose Deployment @ Rikku"
           notification_message: "Starting Docker Compose run..."
 
-      - name: Login to registries
+      - name: Login to Docker Hub
         uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
-          registry-auth: |
-            - username: ${{ secrets.DOCKERHUB_USER }}
-              password: ${{ secrets.DOCKERHUB_PASSWORD }}
-            - registry: ghcr.io
-              username: ${{ secrets.GHCR_USER }}
-              password: ${{ secrets.GHCR_LOGIN_TOKEN }}
-            - registry: git.trez.wtf
-              username: ${{ secrets.BOT_GITEA_USER }}
-              password: ${{ secrets.BOT_GITEA_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GHCR_USER }}
+          password: ${{ secrets.GHCR_LOGIN_TOKEN }}
+
+      - name: Login to Private Gitea Registry
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          registry: git.trez.wtf
+          username: ${{ secrets.BOT_GITEA_USER }}
+          password: ${{ secrets.BOT_GITEA_PASSWORD }}
 
       - name: Docker Compose Deployment
         uses: cssnr/stack-deploy-action@d58b92bcd776afc57ef12f55bafff71200fd218e # v1.4.0