X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/46a6199f3a40a24ee145adc390500190b17a6395..8d2aebfd3a0e4814b292659710386f949cafe092:/docker/build_tools/Makefile

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 73121300ca..7570296013 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -20,8 +20,14 @@ clean:
 DEBIAN_IMAGE := $(shell $(DOCKER) images -q arvados/debian |head -n1)
 
 REALCLEAN_CONTAINERS := $(shell $(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e keep_proxy_server -e doc_server -e workbench_server |cut -f 1 -d' ')
-REALCLEAN_IMAGES := $(shell $(DOCKER) images -q arvados/* |grep -v $(DEBIAN_IMAGE) 2>/dev/null)
-DEEPCLEAN_IMAGES := $(shell $(DOCKER) images -q arvados/*)
+# Generate a list of docker images tagged as arvados/*
+# but exclude those tagged as arvados/build
+ADI_TEMPFILE := $(shell mktemp)
+ARVADOS_DOCKER_IMAGES := $(shell $(DOCKER) images -q arvados/* |sort > $(ADI_TEMPFILE))
+ABDI_TEMPFILE := $(shell mktemp)
+ARVADOS_BUILD_DOCKER_IMAGES := $(shell $(DOCKER) images -q arvados/build |sort > $(ABDI_TEMPFILE))
+REALCLEAN_IMAGES := $(shell comm -3 $(ADI_TEMPFILE) $(ABDI_TEMPFILE) |grep -v $(DEBIAN_IMAGE) 2>/dev/null)
+DEEPCLEAN_IMAGES := $(shell comm -3 $(ADI_TEMPFILE) $(ABDI_TEMPFILE))
 SKYDNS_CONTAINERS := $(shell $(DOCKER) ps -a |grep -e crosbymichael/skydns -e crosbymichael/skydock |cut -f 1 -d' ')
 SKYDNS_IMAGES := $(shell $(DOCKER) images -q crosbymichael/skyd*)
 
@@ -210,7 +216,7 @@ keep-proxy-image: debian-arvados-image $(BUILD) $(KEEP_PROXY_DEPS)
 	$(DOCKER_BUILD) -t arvados/keepproxy keepproxy
 	date >keep-proxy-image
 
-jobs-image: base-image $(BUILD) $(JOBS_DEPS)
+jobs-image: debian-arvados-image $(BUILD) $(JOBS_DEPS)
 	$(DOCKER_BUILD) -t arvados/jobs jobs
 	date >jobs-image
 
@@ -261,7 +267,7 @@ base-image: debian-arvados-image $(BASE_DEPS)
 
 debian-arvados-image:
 	@echo "Building debian-arvados-image"
-	./mkimage-debootstrap.sh arvados/debian wheezy ftp://ftp.us.debian.org/debian/
+	./mkimage-debootstrap.sh arvados/debian wheezy http://ftp.us.debian.org/debian/
 	date >debian-arvados-image
 
 skydns-image: