openstack/skyline-apiserver
Code Issues Proposed changes

Change to use shell cat to fetch commit_id

Browse Source 
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
This commit is contained in:
zhuboxiang 2024-07-03 10:38:14 +08:00
parent d3c48c17f8
commit 2a3a08e328
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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 \