image

Signed-off-by: weizhoublue <[email protected]>
spidernet-io · Dec 26, 2024 · 2e37522 · 2e37522
1 parent c7811b5
commit 2e37522
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -23,11 +23,11 @@ images: controller-image agent-image tools-image
 
 .PHONY: controller-image
 controller-image:
-	docker build -t $(CONTROLLER_IMAGE_REF) -f image/controller/Dockerfile .
+	docker build $(DOCKER_BUILD_FLAGS) -t $(CONTROLLER_IMAGE_REF) -f image/controller/Dockerfile .
 
 .PHONY: agent-image
 agent-image:
-	docker build -t $(AGENT_IMAGE_REF) -f image/agent/Dockerfile .
+	docker build $(DOCKER_BUILD_FLAGS) -t $(AGENT_IMAGE_REF) -f image/agent/Dockerfile .
 
 .PHONY: tools-image
 tools-image: build-tools-image

diff --git a/Makefile.def b/Makefile.def
@@ -52,3 +52,4 @@ PROJECT_VERSION = $(shell cat $(dir $(lastword $(MAKEFILE_LIST)))/VERSION)
 GIT_COMMIT_VERSION = $(shell git show -s --format='format:%H')
 GIT_COMMIT_TIME = $(shell git show -s --format='format:%aI')
 
+DOCKER_BUILD_FLAGS := --build-arg GIT_COMMIT_VERSION=$(GIT_COMMIT_VERSION) --build-arg GIT_COMMIT_TIME=$(GIT_COMMIT_TIME) --build-arg PROJECT_VERSION=$(PROJECT_VERSION)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,3 +52,4 @@ PROJECT_VERSION = $(shell cat $(dir $(lastword $(MAKEFILE_LIST)))/VERSION)
		GIT_COMMIT_VERSION = $(shell git show -s --format='format:%H')
		GIT_COMMIT_TIME = $(shell git show -s --format='format:%aI')

		DOCKER_BUILD_FLAGS := --build-arg GIT_COMMIT_VERSION=$(GIT_COMMIT_VERSION) --build-arg GIT_COMMIT_TIME=$(GIT_COMMIT_TIME) --build-arg PROJECT_VERSION=$(PROJECT_VERSION)