From 2a3a08e32830216e7c5e5b05880253a4b34e03af Mon Sep 17 00:00:00 2001 From: zhuboxiang Date: Wed, 3 Jul 2024 10:38:14 +0800 Subject: [PATCH] Change to use shell cat to fetch commit_id Command file can not do correct when run it on centos 7 with docker to build. So Change it to use shell cat. Change-Id: I1186b22c224bbc6e828f71014f5b7f920df3a651 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e61b4c7..3f2ea39 100644 --- a/Makefile +++ b/Makefile @@ -91,14 +91,14 @@ else endif build: skyline_console/skyline_console.tar.gz skyline_console/commit_id $(build_cmd) --no-cache --pull --force-rm \ - --build-arg GIT_CONSOLE_COMMIT=$(file < skyline_console/commit_id) \ + --build-arg GIT_CONSOLE_COMMIT=$(shell cat skyline_console/commit_id) \ --build-arg GIT_BRANCH=$(GIT_BRANCH) \ --build-arg GIT_COMMIT=$(GIT_COMMIT) \ --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \ $(BUILD_ARGS) -f $(DOCKER_FILE) -t $(IMAGE):$(IMAGE_TAG) $(BUILD_CONTEXT) devbuild: skyline_console/skyline_console.tar.gz skyline_console/commit_id $(build_cmd) \ - --build-arg GIT_CONSOLE_COMMIT=$(file < skyline_console/commit_id) \ + --build-arg GIT_CONSOLE_COMMIT=$(shell cat skyline_console/commit_id) \ --build-arg GIT_BRANCH=devbuild \ --build-arg GIT_COMMIT=devbuild \ --build-arg RELEASE_VERSION=devbuild \