From 275bc544eb7a947477d2c47e90c09324199bd7ba Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 6 Mar 2025 16:10:36 +0800 Subject: [PATCH] bugfix: docker image not showing the correct version --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2721ab5e213..5e18c277968 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ # https://stackoverflow.com/questions/920413/make-error-missing-separator # https://tutorialedge.net/golang/makefiles-for-go-developers/ -SHA := $(shell if [ -d .git ]; then git show -s --format=%h; else echo "default_SHA"; fi) -TAG := $(shell if [ -d .git ]; then git tag --points-at HEAD; else echo "default_TAG"; fi) +SHA ?= $(shell if [ -d .git ]; then git show -s --format=%h; else echo "unknown_sha"; fi) +TAG ?= $(shell if [ -d .git ]; then git tag --points-at HEAD; else echo "local_build"; fi) IMAGE_REPO ?= "apache" VERSION = $(TAG)@$(SHA)