clean up build containers on make clean; rename for consistency

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>

alpine/Makefile

@@ -10,10 +10,11 @@ kernel/aufs-utils.tar:
 initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) kernel/aufs-utils.tar
 	rm -f initrd.img
 	$(MAKE) -C packages
-	docker build -t moby:build .
-	docker run moby:build /bin/mkinitrd.sh > $@
+	docker build -t initrd:build .
+	docker run mobyinitrd:build /bin/mkinitrd.sh > $@
 
 clean:
 	rm -f initrd.img
 	$(MAKE) -C packages clean
 	$(MAKE) -C kernel clean
+	docker images -q mobyinitrd:build | xargs docker rmi -f

alpine/kernel/Makefile

@@ -9,3 +9,4 @@ aufs-utils.tar: vmlinuz64
 
 clean:
 	rm -f vmlinuz64 aufs-utils.tar
+	docker images -q mobykernel:build | xargs docker rmi -f

alpine/packages/9pudc/Makefile

@@ -1,9 +1,10 @@
 all: 9pudc
 
 9pudc: Dockerfile main.go
-	docker build --build-arg GOOS=$(GOOS) --build-arg GOARCH=$(GOARCH) -t 9pudc:test .
-	docker run 9pudc:test cat /go/bin/9pudc > 9pudc
+	docker build --build-arg GOOS=$(GOOS) --build-arg GOARCH=$(GOARCH) -t 9pudc:build .
+	docker run 9pudc:build cat /go/bin/9pudc > 9pudc
 	chmod 755 9pudc
 
 clean:
 	rm -f 9pudc
+	docker images -q 9pudc:build | xargs docker rmi -f

alpine/packages/9pudfuse/Makefile

@@ -1,10 +1,11 @@
 all: 9pudfuse
 
 9pudfuse: Dockerfile fuse_socket_9p.ml
-	docker build -t 9pudfuse:test .
-	docker run 9pudfuse:test \
+	docker build -t 9pudfuse:build .
+	docker run 9pudfuse:build \
 		cat fuse_socket_9p.native > 9pudfuse
 	chmod 755 9pudfuse
 
 clean:
 	rm -f 9pudfuse
+	docker images -q 9pudfuse:build | xargs docker rmi -f

alpine/packages/mdnstool/Makefile

@@ -1,9 +1,10 @@
 all: mdnstool
 
 mdnstool: Dockerfile mdnstool.go mdnsmon/mdnsmon.go
-	docker build -t mdnstool:test .
-	docker run mdnstool:test cat /go/bin/mdnstool > mdnstool
+	docker build -t mdnstool:build .
+	docker run mdnstool:build cat /go/bin/mdnstool > mdnstool
 	chmod 755 mdnstool
 
 clean:
 	rm -f mdnstool
+	docker images -q mdnstool:build | xargs docker rmi -f