From ccbd2f971c34ea2c7da5f45c7c270d2804b7b9e9 Mon Sep 17 00:00:00 2001
From: vlakoff <544424+vlakoff@users.noreply.github.com>
Date: Thu, 30 Apr 2026 09:50:55 +0200
Subject: [PATCH] Fix Docker image push condition to exclude merge queue

The push condition only excluded pull_request events, causing
the builder to attempt a push on merge_group events too.

Since no meta-tag rule matches merge_group, this results in
a push with no tag, which fails or produces a broken image.

Now only pushes on branch/tag push and workflow_dispatch.
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8e703812..29f83315 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,7 +36,7 @@ jobs:
       context: . # Use local checkout to support GitHub Merge Queue
       output: image
       platforms: linux/amd64,linux/arm64
-      push: ${{ github.event_name != 'pull_request' }}
+      push: ${{ github.event_name != 'pull_request' && github.event_name != 'merge_group' }}
       cache: ${{ github.event_name != 'workflow_dispatch' || inputs.use_cache }}
       # We don't sign the image because ghcr.io doesn't support OCI Referrers API yet, and the fallback relies on pushing new tags on each build
       # https://github.com/docker/github-builder/issues/109#issuecomment-3885082486