Merge pull request #602 from justincormack/no-no-prune

do not remove build containers

Makefile

@@ -22,10 +22,11 @@ qemu-iso: Dockerfile.qemuiso alpine/mobylinux-bios.iso
 
 test: Dockerfile.test alpine/initrd.img alpine/kernel/x86_64/vmlinuz64
 	$(MAKE) -C alpine
-	BUILD=$$( tar cf - $^ | docker build -f Dockerfile.test -q - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $^ | docker build -f Dockerfile.test -q - ) && \
+	[ -n "$$BUILD" ] && \
+	echo "Built $$BUILD" && \
 	touch test.log && \
-	docker run --rm $$BUILD 2>&1 | tee -a test.log && \
+	docker run --rm $$BUILD 2>&1 | tee -a test.log
-	docker rmi --no-prune $$BUILD
 	@cat test.log | grep -q 'Moby test suite PASSED'
 
 TAG=$(shell git rev-parse HEAD)

alpine/Makefile

@@ -30,15 +30,13 @@ initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES)
 	  -C packages/aws etc -C ../.. \
 	  -C packages/azure etc -C ../.. \
 	  | \
-	  docker build -q - ) && [ -n "$$BUILD" ] && \
+	  docker build -q - ) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && \
-	docker run --net=none --log-driver=none --rm $$BUILD > $@ && \
+	docker run --net=none --log-driver=none --rm $$BUILD > $@
-	docker rmi --no-prune $$BUILD
 
 mobylinux-efi.iso: Dockerfile.efi initrd.img kernel/x86_64/vmlinuz64
-	BUILD=$$( tar cf - $^ | docker build -q -f Dockerfile.efi - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $^ | docker build -q -f Dockerfile.efi - ) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && \
 	docker run --net=none --log-driver=none --rm --cap-add sys_admin $$BUILD cat /tmp/efi/mobylinux.efi > mobylinux.efi && \
-	docker run --net=none --log-driver=none --rm --cap-add sys_admin $$BUILD cat /tmp/efi/mobylinux-efi.iso > $@ && \
+	docker run --net=none --log-driver=none --rm --cap-add sys_admin $$BUILD cat /tmp/efi/mobylinux-efi.iso > $@
-	docker rmi --no-prune $$BUILD
 
 mobylinux-bios.iso: initrd.img kernel/x86_64/vmlinuz64
 	tar cf - initrd.img -C kernel/x86_64 vmlinuz64 | \

alpine/kernel/Makefile

@@ -4,12 +4,11 @@ all:	x86_64/vmlinuz64
 
 x86_64/vmlinuz64: Dockerfile kernel_config
 	mkdir -p x86_64 etc
-	BUILD=$$( docker build --build-arg DEBUG=$(DEBUG) -q . ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( docker build --build-arg DEBUG=$(DEBUG) -q . ) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && \
 	docker run --rm --net=none --log-driver=none $$BUILD cat /kernel-modules.tar | tar xf - && \
 	docker run --rm --net=none --log-driver=none $$BUILD cat /aufs-utils.tar | tar xf - && \
 	docker run --rm --net=none --log-driver=none $$BUILD cat /kernel-source-info > etc/kernel-source-info && \
 	docker run --rm --net=none --log-driver=none $$BUILD cat /linux/arch/x86_64/boot/bzImage > $@ && \
-	docker rmi --no-prune $$BUILD
 	cp -a patches etc/kernel-patches
 
 clean:

alpine/packages/9pmount-vsock/Makefile

@@ -2,9 +2,11 @@ DEPS=Dockerfile $(wildcard *.c *.h)
 
 9pmount-vsock: $(DEPS)
 	mkdir -p sbin
-	BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && \
-	docker run --rm --net=none $$BUILD | tar xf - -C sbin && \
+	[ -n "$$BUILD" ] && \
-	docker rmi --no-prune $$BUILD
+	echo "Built $$BUILD" && \
+	docker run --rm --net=none $$BUILD | tar xf - -C sbin
+
 
 clean:
 	rm -rf sbin

alpine/packages/diagnostics/Makefile

@@ -3,9 +3,10 @@ all: usr/bin/diagnostics-server
 DEPS=Dockerfile $(wildcard *.go)
 
 usr/bin/diagnostics-server: $(DEPS) ../vendor/manifest
-	BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && \
-	docker run --rm --net=none $$BUILD | tar xf - -C usr/bin && \
+	[ -n "$$BUILD" ] && \
-	docker rmi --no-prune $$BUILD
+	echo "Built $$BUILD" && \
+	docker run --rm --net=none $$BUILD | tar xf - -C usr/bin
 
 clean:
 	rm -f usr/bin/diagnostics-server

alpine/packages/iptables/Makefile

@@ -2,9 +2,10 @@ all: usr/local/sbin/iptables
 
 usr/local/sbin/iptables: Dockerfile main.ml
 	mkdir -p usr/local/sbin
-	BUILD=$$( docker build -q . ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( docker build -q . ) && \
-	docker run --rm $$BUILD | tar xf - -C usr/local/sbin && \
+	[ -n "$$BUILD" ] && \
-	docker rmi --no-prune $$BUILD
+	echo "Built $$BUILD" && \
+	docker run --rm $$BUILD | tar xf - -C usr/local/sbin
 
 clean:
 	rm -rf usr

alpine/packages/nc-vsock/Makefile

@@ -2,9 +2,10 @@ DEPS=Dockerfile $(wildcard *.c *.h)
 
 usr/bin/nc-vsock: $(DEPS)
 	mkdir -p usr/bin
-	BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && \
-	docker run --rm --net=none $$BUILD | tar xf - -C usr/bin && \
+	[ -n "$$BUILD" ] && \
-	docker rmi --no-prune $$BUILD
+	echo "Built $$BUILD" && \
+	docker run --rm --net=none $$BUILD | tar xf - -C usr/bin
 
 clean:
 	rm -rf usr

alpine/packages/proxy/Makefile

@@ -3,9 +3,10 @@ all: usr/bin/slirp-proxy sbin/proxy-vsockd
 DEPS=Dockerfile $(wildcard *.go libproxy/*.go)
 
 proxy: $(DEPS) ../vendor/manifest
-	BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && \
-	docker run --rm --net=none $$BUILD | tar xf - && \
+	[ -n "$$BUILD" ] && \
-	docker rmi --no-prune $$BUILD
+	echo "Built $$BUILD" && \
+	docker run --rm --net=none $$BUILD | tar xf -
 
 usr/bin/slirp-proxy: proxy
 	mkdir -p usr/bin

alpine/packages/tap-vsockd/Makefile

@@ -2,9 +2,10 @@ DEPS=Dockerfile $(wildcard *.c *.h)
 
 sbin/tap-vsockd: $(DEPS)
 	mkdir -p sbin
-	BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && \
-	docker run --rm --net=none $$BUILD | tar xf - -C sbin && \
+	[ -n "$$BUILD" ] && \
-	docker rmi --no-prune $$BUILD
+	echo "Built $$BUILD" && \
+	docker run --rm --net=none $$BUILD | tar xf - -C sbin
 
 clean:
 	rm -rf sbin

alpine/packages/transfused/Makefile

@@ -2,9 +2,10 @@ DEPS=Dockerfile $(wildcard *.c *.h)
 
 sbin/transfused: $(DEPS)
 	mkdir -p sbin
-	BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && \
-	docker run --rm --net=none $$BUILD | tar xf - -C sbin && \
+	[ -n "$$BUILD" ] && \
-	docker rmi --no-prune $$BUILD
+	echo "Built $$BUILD" && \
+	docker run --rm --net=none $$BUILD | tar xf - -C sbin
 
 clean:
 	rm -rf sbin

alpine/packages/vsudd/Makefile

@@ -4,9 +4,10 @@ DEPS=Dockerfile $(wildcard *.go)
 
 vsudd: $(DEPS) ../vendor/manifest
 	mkdir -p sbin
-	BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && [ -n "$$BUILD" ] && \
+	BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && \
-	docker run --rm --net=none $$BUILD | tar xf - -C sbin && \
+	[ -n "$$BUILD" ] && \
-	docker rmi --no-prune $$BUILD
+	echo "Built $$BUILD" && \
+	docker run --rm --net=none $$BUILD | tar xf - -C sbin
 
 clean:
 	rm -rf sbin