Docker Registry logins.

.gitea/workflows/pr-docker-deploy.yml

@@ -341,22 +341,25 @@ jobs:
         with:
           version: ${{ env.HC_VAULT_VERSION }}
 
-      # - name: Login to Gitea Container Registry
-      #   run: |
-      #     docker login -u gitea-sonarqube-bot -p ${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
@@ -383,9 +386,6 @@ jobs:
           ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }}
           args: --remove-orphans ${{ needs.generate-service-list.outputs.svc_deploy_list }}
           env_file: ".env"
-          # registry_host: 'ghcr.io'
-          # registry_user: TrezOne
-          # registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }}
           summary: true
 
       - name: Gotify Notification

.gitea/workflows/renovate-pr-deploy.yml

@@ -143,18 +143,25 @@ jobs:
         run: |
           vault kv get -format=json benedikta-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
 
-      - 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
@@ -175,9 +182,6 @@ jobs:
           ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }}
           args: --remove-orphans ${{ steps.services.outputs.docker_svc_list }}
           env_file: ".env"
-          # registry_host: 'ghcr.io'
-          # registry_user: TrezOne
-          # registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }}
           summary: true
 
       - name: Gotify Notification