From b042588e4fa11bc223071f138f74a8220ab968af Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 19 Jul 2026 14:42:18 +0000
Subject: [PATCH 1/2] fix docker workflow branch tagging

---
 .github/workflows/docker.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index e31037d9..c9aac00d 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: ${{ github.ref }}
+          ref: ${{ github.event.workflow_run.head_sha || github.sha }}
 
       - name: Install python
         uses: actions/setup-python@v5
@@ -64,12 +64,15 @@ jobs:
 
       - name: Get git branch and short sha for tag
         run: |
-          git_hash_short=$(git rev-parse --short "$GITHUB_SHA")
-          echo "GIT_HASH_SHORT=${git_hash_short}" >> $GITHUB_ENV
-          git_branch=$(git branch -r --contains ${{ github.ref }} --merged ${{ github.ref }} --format "%(refname:lstrip=3)" | grep -v HEAD)
-          echo "GIT_BRANCH=${git_branch}" >> $GITHUB_ENV
-          git_branch_docker_safe=$(echo ${git_branch} | tr / -)
-          echo "GIT_BRANCH_DOCKER_SAFE=${git_branch_docker_safe}" >> $GITHUB_ENV
+          git_hash_short=$(git rev-parse --short "${{ github.event.workflow_run.head_sha || github.sha }}")
+          echo "GIT_HASH_SHORT=${git_hash_short}" >> "$GITHUB_ENV"
+          git_branch="${{ github.event.workflow_run.head_branch || github.ref_name }}"
+          if [[ -z "${git_branch}" ]]; then
+            git_branch=$(git rev-parse --abbrev-ref HEAD)
+          fi
+          echo "GIT_BRANCH=${git_branch}" >> "$GITHUB_ENV"
+          git_branch_docker_safe=$(echo "${git_branch}" | tr / -)
+          echo "GIT_BRANCH_DOCKER_SAFE=${git_branch_docker_safe}" >> "$GITHUB_ENV"
 
       # Tagging documented at: https://github.com/docker/metadata-action?tab=readme-ov-file#basic
       - name: Extract metadata (tags, labels) for Docker

From 116bf63db87ebb952ca6396434c54e1144da2425 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 19 Jul 2026 14:45:10 +0000
Subject: [PATCH 2/2] harden docker workflow env handling

---
 .github/workflows/docker.yaml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index c9aac00d..5be54b2e 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -63,16 +63,19 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get git branch and short sha for tag
+        env:
+          EVENT_BRANCH: ${{ github.event.workflow_run.head_branch || github.ref_name }}
+          EVENT_SHA: ${{ github.event.workflow_run.head_sha || github.sha }}
         run: |
-          git_hash_short=$(git rev-parse --short "${{ github.event.workflow_run.head_sha || github.sha }}")
-          echo "GIT_HASH_SHORT=${git_hash_short}" >> "$GITHUB_ENV"
-          git_branch="${{ github.event.workflow_run.head_branch || github.ref_name }}"
+          git_hash_short=$(git rev-parse --short "$EVENT_SHA")
+          printf 'GIT_HASH_SHORT=%s\n' "${git_hash_short}" >> "$GITHUB_ENV"
+          git_branch="$EVENT_BRANCH"
           if [[ -z "${git_branch}" ]]; then
             git_branch=$(git rev-parse --abbrev-ref HEAD)
           fi
-          echo "GIT_BRANCH=${git_branch}" >> "$GITHUB_ENV"
+          printf 'GIT_BRANCH=%s\n' "${git_branch}" >> "$GITHUB_ENV"
           git_branch_docker_safe=$(echo "${git_branch}" | tr / -)
-          echo "GIT_BRANCH_DOCKER_SAFE=${git_branch_docker_safe}" >> "$GITHUB_ENV"
+          printf 'GIT_BRANCH_DOCKER_SAFE=%s\n' "${git_branch_docker_safe}" >> "$GITHUB_ENV"
 
       # Tagging documented at: https://github.com/docker/metadata-action?tab=readme-ov-file#basic
       - name: Extract metadata (tags, labels) for Docker