From de993c560593ca12b1b7436337aa9a3d4c273825 Mon Sep 17 00:00:00 2001 From: fengsilin Date: Fri, 5 Jun 2026 17:17:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(docker):=20=E9=95=9C=E5=83=8F=20tag=20?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=20commit=20hash=EF=BC=8C=E6=9C=AA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BB=A3=E7=A0=81=E6=A0=87=E8=AE=B0=20dirty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 格式:{时间}-{分支}-{短commit}[-dirty] 示例:202606051500-master-e9d5d51b(干净) 202606051500-master-e9d5d51b-dirty(有未提交改动) --- makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 7b779c4..30c12a2 100644 --- a/makefile +++ b/makefile @@ -21,7 +21,9 @@ start-backend: DOCKER_REGISTRY := registry.cn-hangzhou.aliyuncs.com/fengsilin/new-api BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD | sed 's/\//-/g') BUILD_TIME := $(shell date +%Y%m%d%H%M) -DOCKER_TAG := $(DOCKER_REGISTRY):$(BUILD_TIME)-$(BRANCH_NAME) +COMMIT_SHORT := $(shell git rev-parse --short HEAD) +GIT_DIRTY := $(shell git diff --quiet && git diff --cached --quiet || echo "-dirty") +DOCKER_TAG := $(DOCKER_REGISTRY):$(BUILD_TIME)-$(BRANCH_NAME)-$(COMMIT_SHORT)$(GIT_DIRTY) docker-build: @echo "Building Docker image with tag: $(DOCKER_TAG)"