From 72b5cb20903c23519806c53380a68eae8100434d Mon Sep 17 00:00:00 2001
From: vados-dev <192440777+vados-dev@users.noreply.github.com>
Date: Sat, 16 May 2026 00:55:19 +0300
Subject: [PATCH] Refactor Docker workflow for improved registry login

---
 .github/workflows/docker.yml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a6bb01f4..39f05558 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,7 +5,8 @@ permissions:
   packages: write
 
 env:
-  IMAGE_NAME: "reg.vados.ru/3x-ui"
+  CI_IMAGE_NAME: "3x-ui"
+  CI_RETGISTRY: "reg.vados.ru"
 
 on:
   workflow_dispatch:
@@ -24,9 +25,12 @@ jobs:
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v6
+        env:
+           registry: ${{ env.CI_RETGISTRY }}
+           image: ${{ env.CI_IMAGE_NAME }}
         with:
           images: |
-            ${{ env.IMAGE_NAME }}
+            $registry/$image
 #            ghcr.io/vados-dev/${{ env.IMAGE_NAME }}
           flavor: |
              latest=auto
@@ -41,14 +45,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: Login to reg.vados.ru
-        uses: docker/login-action@v2
-        with:
-          registry: reg.vados.ru
-          username: ${{ vars.REG_USER }}
-          password: ${{ secrets.REG_PASS }}
-#          scope: '${IMAGE_NAME}@push'
-
+      - name: Login to registry
+        shell: bash
+        run: |
+          set -euo pipefail
+          echo ${{ secrets.REG_PASS }} | docker login ${{ env.CI_RETGISTRY }} -u {{ vars.REG_USER }} --password-stdin
+          
       - name: Build and push Docker image
         uses: docker/build-push-action@v7
         with:
@@ -59,6 +61,13 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
+#        uses: docker/login-action@v2
+#        with:
+#          registry: reg.vados.ru
+#          username: ${{ vars.REG_USER }}
+#          password: ${{ secrets.REG_PASS }}
+#          scope: '${IMAGE_NAME}@push'
+
 #      - name: Login to registries
 #        uses: docker/login-action@v4
 #        with: