Only the deepclean Make action should remove the skydns-image and skydock-image files.

refs #3363

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 09c09cc1e60e7b9395eeac4c4c64b5a177861c60..eb611eadeb12d2388f771bfc1a0b1cf5e84f1421 100644 (file)
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -6,7 +6,7 @@ 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 debian-arvados-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)
 
@@ -40,6 +40,7 @@ realclean: clean
 deepclean: clean
        @echo "make deepclean"
        -@rm -f debian-arvados-image 2>/dev/null
+       -@rm -f skydns-image skydock-image 2>/dev/null
        +@[ "`$(DOCKER) ps -q`" = '' ] || $(DOCKER) stop `$(DOCKER) ps -q`
        +@[ "$(REALCLEAN_CONTAINERS)" = '' ] || $(DOCKER) rm $(REALCLEAN_CONTAINERS)
        +@[ "$(DEEPCLEAN_IMAGES)" = '' ] || $(DOCKER) rmi $(DEEPCLEAN_IMAGES)