From c4014a5019ad0c4e6bdc5dfcff303100a0769c59 Mon Sep 17 00:00:00 2001 From: Wu Wenxiang Date: Wed, 17 Jan 2024 13:33:54 +0800 Subject: [PATCH] fix: remove console tarball before downloading if console tarball exist, the new downloaded package would rename as xxxx.1, which cause unzip mistake (unzip the original one) Change-Id: Iba121d1605749f78814d6a5720254184ebe56ba7 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 416c901..8d9b9ee 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-*/skyline_console/static/commit_id.txt); \ + GIT_CONSOLE_COMMIT=$(shell rm -rf skyline-console-master.tar.gz && 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-*