From 8ce821adb90bd1f855c8f1697e9c55099f81444b Mon Sep 17 00:00:00 2001
From: yusing <yusing.wys@gmail.com>
Date: Thu, 22 Jan 2026 16:16:03 +0800
Subject: [PATCH] feat(ci): pass BRANCH to Makefile for correct build tag

---
 .github/workflows/docker-image.yml | 6 ++++++
 Dockerfile                         | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 1b9c39ff..bc8bef41 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -66,6 +66,11 @@ jobs:
             version="v$(date -u +'%Y%m%d-%H%M')"
           fi
           echo "VERSION_FOR_BUILD=$version" >> $GITHUB_ENV
+          if [ "${GITHUB_REF_TYPE}" = "branch" ]; then
+            echo "BRANCH_FOR_BUILD=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+          else
+            echo "BRANCH_FOR_BUILD=" >> $GITHUB_ENV
+          fi
 
       - name: Docker meta
         id: meta
@@ -105,6 +110,7 @@ jobs:
           build-args: |
             VERSION=${{ env.VERSION_FOR_BUILD }}
             MAKE_ARGS=${{ env.MAKE_ARGS }}
+            BRANCH=${{ env.BRANCH_FOR_BUILD }}
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
diff --git a/Dockerfile b/Dockerfile
index 8805895e..8efc5822 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,6 +43,9 @@ ENV VERSION=${VERSION}
 ARG MAKE_ARGS
 ENV MAKE_ARGS=${MAKE_ARGS}
 
+ARG BRANCH
+ENV BRANCH=${BRANCH}
+
 RUN --mount=type=cache,target=/root/.cache/go-build \
   --mount=type=cache,target=/root/go/pkg/mod \
   make ${MAKE_ARGS} docker=1 build