From c12b6edcf0abb87d0975c23fbc8fcd5e2063f918 Mon Sep 17 00:00:00 2001 From: "zhu.boxiang" Date: Fri, 27 May 2022 20:00:57 +0800 Subject: [PATCH] fix: Fix the folder name of skyline-console Fix the folder name of skyline-console when build skyline docker image to get skyline console commit id. Change-Id: I4d8e55c0ddd2914ceabf7a2546ebae213ff864ca --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 01bfa6b..416c901 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ else $(error Unsupported build engine $(BUILD_ENGINE)) endif build: - GIT_CONSOLE_COMMIT=$(shell wget $(SKYLINE_CONSOLE_PACKAGE_URL) && tar -zxf skyline-console-master.tar.gz && cat skyline-console-0.1.0/skyline_console/static/commit_id.txt); \ + GIT_CONSOLE_COMMIT=$(shell wget $(SKYLINE_CONSOLE_PACKAGE_URL) && tar -zxf skyline-console-master.tar.gz && cat skyline-console-*/skyline_console/static/commit_id.txt); \ $(build_cmd) --no-cache --pull --force-rm --build-arg RELEASE_VERSION=$(RELEASE_VERSION) --build-arg SKYLINE_CONSOLE_PACKAGE_URL=$(SKYLINE_CONSOLE_PACKAGE_URL) --build-arg GIT_BRANCH=$(GIT_BRANCH) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg GIT_CONSOLE_COMMIT=$$GIT_CONSOLE_COMMIT $(BUILD_ARGS) -f $(DOCKER_FILE) -t $(IMAGE):$(IMAGE_TAG) $(BUILD_CONTEXT) rm -rf skyline-console-*