From 71fc994a639702f17d191c48990932d149df8f36 Mon Sep 17 00:00:00 2001 From: Shang Chieh Tseng Date: Sat, 8 Nov 2025 17:16:46 +0800 Subject: [PATCH] Fix Docker build: clean host artifacts after copy to prevent conflicts - Add cleanup step in copy-source target to remove build/, ollama, and dist/ - Prevents host build artifacts from interfering with container builds - Ensures clean build environment when switching between host and Docker workflows - docker cp doesn't respect .dockerignore, so explicit cleanup is needed --- docker/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Makefile b/docker/Makefile index 6dde1415..3ac0d5ed 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -114,7 +114,9 @@ stop-builder: copy-source: start-builder @echo "→ Copying source code to container..." @docker cp $(SOURCE_DIR)/. $(CONTAINER_NAME):/usr/local/src/ollama37/ - @echo " Source code copied" + @echo "→ Cleaning any host build artifacts from container..." + @docker exec $(CONTAINER_NAME) rm -rf /usr/local/src/ollama37/build /usr/local/src/ollama37/ollama /usr/local/src/ollama37/dist + @echo " Source code copied (clean build environment)" # Run CMake configuration run-cmake: copy-source