From cfbdc7d06702d29f0d796e7987e7ed733d23fc13 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 11 Oct 2016 16:12:40 +0100 Subject: [PATCH] do not remove build containers Signed-off-by: Justin Cormack --- Makefile | 7 ++++--- alpine/Makefile | 10 ++++------ alpine/kernel/Makefile | 3 +-- alpine/packages/9pmount-vsock/Makefile | 8 +++++--- alpine/packages/diagnostics/Makefile | 7 ++++--- alpine/packages/iptables/Makefile | 7 ++++--- alpine/packages/nc-vsock/Makefile | 7 ++++--- alpine/packages/proxy/Makefile | 7 ++++--- alpine/packages/tap-vsockd/Makefile | 7 ++++--- alpine/packages/transfused/Makefile | 7 ++++--- alpine/packages/vsudd/Makefile | 7 ++++--- 11 files changed, 42 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index d621133fa..c081c4f63 100644 --- a/Makefile +++ b/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 rmi --no-prune $$BUILD + docker run --rm $$BUILD 2>&1 | tee -a test.log @cat test.log | grep -q 'Moby test suite PASSED' TAG=$(shell git rev-parse HEAD) diff --git a/alpine/Makefile b/alpine/Makefile index ceed0df99..f1afc9556 100644 --- a/alpine/Makefile +++ b/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 run --net=none --log-driver=none --rm $$BUILD > $@ && \ - docker rmi --no-prune $$BUILD + docker build -q - ) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && \ + docker run --net=none --log-driver=none --rm $$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 rmi --no-prune $$BUILD + docker run --net=none --log-driver=none --rm --cap-add sys_admin $$BUILD cat /tmp/efi/mobylinux-efi.iso > $@ mobylinux-bios.iso: initrd.img kernel/x86_64/vmlinuz64 tar cf - initrd.img -C kernel/x86_64 vmlinuz64 | \ diff --git a/alpine/kernel/Makefile b/alpine/kernel/Makefile index 3086c907c..017919d51 100644 --- a/alpine/kernel/Makefile +++ b/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: diff --git a/alpine/packages/9pmount-vsock/Makefile b/alpine/packages/9pmount-vsock/Makefile index b70fa8e0d..e763666ea 100644 --- a/alpine/packages/9pmount-vsock/Makefile +++ b/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" ] && \ - docker run --rm --net=none $$BUILD | tar xf - -C sbin && \ - docker rmi --no-prune $$BUILD + BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && \ + [ -n "$$BUILD" ] && \ + echo "Built $$BUILD" && \ + docker run --rm --net=none $$BUILD | tar xf - -C sbin + clean: rm -rf sbin diff --git a/alpine/packages/diagnostics/Makefile b/alpine/packages/diagnostics/Makefile index 972f25d77..541c19900 100644 --- a/alpine/packages/diagnostics/Makefile +++ b/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" ] && \ - docker run --rm --net=none $$BUILD | tar xf - -C usr/bin && \ - docker rmi --no-prune $$BUILD + BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && \ + [ -n "$$BUILD" ] && \ + echo "Built $$BUILD" && \ + docker run --rm --net=none $$BUILD | tar xf - -C usr/bin clean: rm -f usr/bin/diagnostics-server diff --git a/alpine/packages/iptables/Makefile b/alpine/packages/iptables/Makefile index 3ff27dfd7..79ed74354 100644 --- a/alpine/packages/iptables/Makefile +++ b/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" ] && \ - docker run --rm $$BUILD | tar xf - -C usr/local/sbin && \ - docker rmi --no-prune $$BUILD + BUILD=$$( docker build -q . ) && \ + [ -n "$$BUILD" ] && \ + echo "Built $$BUILD" && \ + docker run --rm $$BUILD | tar xf - -C usr/local/sbin clean: rm -rf usr diff --git a/alpine/packages/nc-vsock/Makefile b/alpine/packages/nc-vsock/Makefile index 17a431a16..97a0071c3 100644 --- a/alpine/packages/nc-vsock/Makefile +++ b/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" ] && \ - docker run --rm --net=none $$BUILD | tar xf - -C usr/bin && \ - docker rmi --no-prune $$BUILD + BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && \ + [ -n "$$BUILD" ] && \ + echo "Built $$BUILD" && \ + docker run --rm --net=none $$BUILD | tar xf - -C usr/bin clean: rm -rf usr diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile index 9206dcff6..964b08a6d 100644 --- a/alpine/packages/proxy/Makefile +++ b/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" ] && \ - docker run --rm --net=none $$BUILD | tar xf - && \ - docker rmi --no-prune $$BUILD + BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && \ + [ -n "$$BUILD" ] && \ + echo "Built $$BUILD" && \ + docker run --rm --net=none $$BUILD | tar xf - usr/bin/slirp-proxy: proxy mkdir -p usr/bin diff --git a/alpine/packages/tap-vsockd/Makefile b/alpine/packages/tap-vsockd/Makefile index e150038e8..e49cb524f 100644 --- a/alpine/packages/tap-vsockd/Makefile +++ b/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" ] && \ - docker run --rm --net=none $$BUILD | tar xf - -C sbin && \ - docker rmi --no-prune $$BUILD + BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && \ + [ -n "$$BUILD" ] && \ + echo "Built $$BUILD" && \ + docker run --rm --net=none $$BUILD | tar xf - -C sbin clean: rm -rf sbin diff --git a/alpine/packages/transfused/Makefile b/alpine/packages/transfused/Makefile index 481353d31..eba8e86f9 100644 --- a/alpine/packages/transfused/Makefile +++ b/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" ] && \ - docker run --rm --net=none $$BUILD | tar xf - -C sbin && \ - docker rmi --no-prune $$BUILD + BUILD=$$( tar cf - $(DEPS) | docker build -q - ) && \ + [ -n "$$BUILD" ] && \ + echo "Built $$BUILD" && \ + docker run --rm --net=none $$BUILD | tar xf - -C sbin clean: rm -rf sbin diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile index 177e6fd4a..ec5aec1a8 100644 --- a/alpine/packages/vsudd/Makefile +++ b/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" ] && \ - docker run --rm --net=none $$BUILD | tar xf - -C sbin && \ - docker rmi --no-prune $$BUILD + BUILD=$$( tar cf - $(DEPS) -C .. vendor | docker build -q - ) && \ + [ -n "$$BUILD" ] && \ + echo "Built $$BUILD" && \ + docker run --rm --net=none $$BUILD | tar xf - -C sbin clean: rm -rf sbin