Refactor Docker workflow for improved registry login

.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,13 +45,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: Login to reg.vados.ru
+      - name: Login to registry
-        uses: docker/login-action@v2
+        shell: bash
-        with:
+        run: |
-          registry: reg.vados.ru
+          set -euo pipefail
-          username: ${{ vars.REG_USER }}
+          echo ${{ secrets.REG_PASS }} | docker login ${{ env.CI_RETGISTRY }} -u {{ vars.REG_USER }} --password-stdin
-          password: ${{ secrets.REG_PASS }}
-#          scope: '${IMAGE_NAME}@push'
           
       - name: Build and push Docker image
         uses: docker/build-push-action@v7
@@ -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: