From 3e5c712ea24bfb45d795c04fb1a99828969fe133 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Fri, 15 May 2026 22:39:52 +0300 Subject: [PATCH] Refactor Docker Hub and registry login steps Consolidate Docker registry login steps into a single action. --- .github/workflows/docker.yml | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4ddee58c..9b309c31 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -41,25 +41,18 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v4 - - name: Login to Docker Hub + - name: Login to registries uses: docker/login-action@v4 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_TOKEN }} - - - name: Login to vados Registry - uses: docker/login-action@v4 - with: - registry: reg.vados.ru - username: ${{ vars.VADOS_REG_USERNAME }} - password: ${{ secrets.VADOS_REG_PASSWORD }} - - - name: Log in to GHCR - uses: docker/login-action@v4 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ github.token }} + registry-auth: | + - username: ${{ vars.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_TOKEN }} + - registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - registry: reg.vados.ru + username: ${{ vars.VADOS_REG_USERNAME }} + password: ${{ secrets.VADOS_REG_PASSWORD }} - name: Build and push Docker image uses: docker/build-push-action@v7