diff --git a/Makefile b/Makefile index 4b5c94652..2328b505e 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ xhyve: all qemu: all docker build -f Dockerfile.qemu -t mobyqemu:build . - docker run -it mobyqemu:build + docker run --rm mobyqemu:build arm: $(MAKE) -C alpine/kernel arm @@ -15,7 +15,7 @@ arm: qemu-arm: Dockerfile.armhf arm docker build -f Dockerfile.qemu.armhf -t mobyarmqemu:build . - docker run -it mobyarmqemu:build + docker run --rm mobyarmqemu:build .PHONY: remora clean remora: Dockerfile.remora remora/do-kexec.sh diff --git a/alpine/Makefile b/alpine/Makefile index 945c9be31..bf196385d 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -9,11 +9,11 @@ initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) $(MAKE) -C kernel cp inittab.x86_64 etc/inittab docker build -t mobyinitrd:build . - docker run mobyinitrd:build /bin/mkinitrd.sh > $@ + docker run --rm mobyinitrd:build /bin/mkinitrd.sh > $@ mobylinux.iso: initrd.img Dockerfile.iso isolinux.cfg docker build -f Dockerfile.iso -t mobyiso:build . - docker run mobyiso:build cat /tmp/output.iso > $@ + docker run --rm mobyiso:build cat /tmp/output.iso > $@ arm: initrd-arm.img @@ -27,7 +27,7 @@ initrd-arm.img: Dockerfile.armhf $(MAKE) -C kernel arm cp inittab.armhf etc/inittab docker build -f Dockerfile.armhf -t mobyinitrdarm:build . - docker run mobyinitrdarm:build /bin/mkinitrd.sh > $@ + docker run --rm mobyinitrdarm:build /bin/mkinitrd.sh > $@ clean: rm -f initrd.img initrd-arm.img Dockerfile.armhf etc/inittab diff --git a/alpine/kernel/Makefile b/alpine/kernel/Makefile index 8404677c4..43890e2d9 100644 --- a/alpine/kernel/Makefile +++ b/alpine/kernel/Makefile @@ -2,16 +2,16 @@ all: vmlinuz64 vmlinuz64: kernel_config Dockerfile docker build -t mobykernel:build . - docker run mobykernel:build cat /linux/arch/x86_64/boot/bzImage > $@ - docker run mobykernel:build cat /aufs-utils.tar > aufs-utils.tar + docker run --rm mobykernel:build cat /linux/arch/x86_64/boot/bzImage > $@ + docker run --rm mobykernel:build cat /aufs-utils.tar > aufs-utils.tar arm: zImage zImage: kernel_config.arm Dockerfile docker build --build-arg ARCH=arm -t mobyarmkernel:build . - docker run mobyarmkernel:build cat /linux/arch/arm/boot/zImage > $@ - docker run mobyarmkernel:build cat /dtb > dtb - docker run mobyarmkernel:build cat /aufs-utils.tar > aufs-utils.tar + docker run --rm mobyarmkernel:build cat /linux/arch/arm/boot/zImage > $@ + docker run --rm mobyarmkernel:build cat /dtb > dtb + docker run --rm mobyarmkernel:build cat /aufs-utils.tar > aufs-utils.tar clean: rm -f zImage vmlinuz64 aufs-utils.tar diff --git a/alpine/packages/9pudc/Makefile b/alpine/packages/9pudc/Makefile index 6bac8ba1f..7bac2eaf3 100644 --- a/alpine/packages/9pudc/Makefile +++ b/alpine/packages/9pudc/Makefile @@ -2,7 +2,7 @@ all: 9pudc 9pudc: Dockerfile main.go docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t 9pudc:build . - docker run 9pudc:build cat /go/bin/9pudc > 9pudc + docker run --rm 9pudc:build cat /go/bin/9pudc > 9pudc chmod 755 9pudc clean: diff --git a/alpine/packages/9pudfuse/Makefile b/alpine/packages/9pudfuse/Makefile index abb7216e3..78e5f6990 100644 --- a/alpine/packages/9pudfuse/Makefile +++ b/alpine/packages/9pudfuse/Makefile @@ -2,7 +2,7 @@ all: 9pudfuse 9pudfuse: Dockerfile fuse_socket_9p.ml docker build -t 9pudfuse:build . - docker run 9pudfuse:build \ + docker run --rm 9pudfuse:build \ cat fuse_socket_9p.native > 9pudfuse chmod 755 9pudfuse diff --git a/alpine/packages/hupper/Makefile b/alpine/packages/hupper/Makefile index 5e541d651..66dca6924 100644 --- a/alpine/packages/hupper/Makefile +++ b/alpine/packages/hupper/Makefile @@ -2,7 +2,7 @@ all: hupper hupper: Dockerfile main.go docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t hupper:build . - docker run hupper:build cat /go/bin/hupper > hupper + docker run --rm hupper:build cat /go/bin/hupper > hupper chmod 755 hupper clean: diff --git a/alpine/packages/hvtools/Makefile b/alpine/packages/hvtools/Makefile index 65b3980a2..cb7fb1c4d 100644 --- a/alpine/packages/hvtools/Makefile +++ b/alpine/packages/hvtools/Makefile @@ -2,9 +2,9 @@ all: hvtools hvtools: Dockerfile src/* docker build -t hvtools:build . - docker run hvtools:build cat /hvtools/hv_fcopy_daemon > hv_fcopy_daemon - docker run hvtools:build cat /hvtools/hv_kvp_daemon > hv_kvp_daemon - docker run hvtools:build cat /hvtools/hv_vss_daemon > hv_vss_daemon + docker run --rm hvtools:build cat /hvtools/hv_fcopy_daemon > hv_fcopy_daemon + docker run --rm hvtools:build cat /hvtools/hv_kvp_daemon > hv_kvp_daemon + docker run --rm hvtools:build cat /hvtools/hv_vss_daemon > hv_vss_daemon chmod 755 hv_fcopy_daemon hv_kvp_daemon hv_vss_daemon clean: diff --git a/alpine/packages/mdnstool/Makefile b/alpine/packages/mdnstool/Makefile index 09d4ff18f..a76304239 100644 --- a/alpine/packages/mdnstool/Makefile +++ b/alpine/packages/mdnstool/Makefile @@ -2,7 +2,7 @@ all: mdnstool mdnstool: Dockerfile mdnstool.go mdnsmon/mdnsmon.go docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t mdnstool:build . - docker run mdnstool:build cat /go/bin/mdnstool > mdnstool + docker run --rm mdnstool:build cat /go/bin/mdnstool > mdnstool chmod 755 mdnstool clean: