From 17e388d6515cfd7f3bb527c982b925270b426419 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Fri, 15 Aug 2014 16:56:34 -0400 Subject: [PATCH] docker: be a bit smarter in the make clean target, so that we also accomodate diretories underneath the generated directory. refs #3551 --- docker/build_tools/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile index 7f3ad69139..f3dd90c6c7 100644 --- a/docker/build_tools/Makefile +++ b/docker/build_tools/Makefile @@ -7,7 +7,6 @@ endif all: skydns-image skydock-image api-image compute-image doc-image workbench-image keep-image sso-image shell-image IMAGE_FILES := $(shell ls *-image 2>/dev/null |grep -v -E 'debian-arvados-image|skydns-image|skydock-image') -GENERATED_FILES := $(shell ls */generated/* 2>/dev/null) GENERATED_DIRS := $(shell ls */generated 2>/dev/null) # `make clean' removes the files generated in the build directory @@ -15,8 +14,8 @@ GENERATED_DIRS := $(shell ls */generated 2>/dev/null) clean: @echo "make clean" -@rm -rf build - +@[ "$(IMAGE_FILES)$(GENERATED_FILES)" = "" ] || rm $(IMAGE_FILES) $(GENERATED_FILES) 2>/dev/null - +@[ "$(GENERATED_DIRS)" = "" ] || rmdir */generated 2>/dev/null + +@[ "$(IMAGE_FILES)" = "" ] || rm -f $(IMAGE_FILES) 2>/dev/null + +@[ "$(GENERATED_DIRS)" = "" ] || rm -rf */generated 2>/dev/null DEBIAN_IMAGE := $(shell $(DOCKER) images -q arvados/debian |head -n1) -- 2.30.2