From f3b41432cb823f84791a85810b0bc9504beada77 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Mon, 6 Jul 2026 07:01:12 +0200
Subject: [PATCH] CI: Fix login+push for publishing Servatrice Docker images
 (#7023)

---
 .github/workflows/docker-release.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index b479322d0..5384c9e64 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -56,8 +56,9 @@ jobs:
       - name: "Set up Docker buildx"
         uses: docker/setup-buildx-action@v4
 
-      - name: "Login to GitHub Container Registry"
-        if: contains(github.event.release.tag_name, 'Release') && github.event.release.target_commitish == 'master'
+      - name: "Login to GitHub Container Registry (GHCR)"
+        if: github.event_name == 'release' && github.event.release.prerelease == false
+        id: login
         uses: docker/login-action@v4
         with:
           password: ${{ github.token }}
@@ -73,5 +74,5 @@ jobs:
           context: .
           labels: ${{ steps.metadata.outputs.labels }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref_type == 'tag' }}
+          push: ${{ steps.login.outcome == 'success' }}
           tags: ${{ steps.metadata.outputs.tags }}