From 4945353da3873202cffef525847789fa4ca027bf Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 17 Feb 2016 13:53:27 +0000 Subject: [PATCH] start using docker compose for build Signed-off-by: Justin Cormack --- alpine/Makefile | 5 ++--- alpine/docker-compose.yml | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 alpine/docker-compose.yml diff --git a/alpine/Makefile b/alpine/Makefile index bf196385d..122096611 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -8,8 +8,7 @@ initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) $(MAKE) -C packages $(MAKE) -C kernel cp inittab.x86_64 etc/inittab - docker build -t mobyinitrd:build . - docker run --rm mobyinitrd:build /bin/mkinitrd.sh > $@ + docker-compose run --rm -T moby /bin/mkinitrd.sh > $@ mobylinux.iso: initrd.img Dockerfile.iso isolinux.cfg docker build -f Dockerfile.iso -t mobyiso:build . @@ -34,5 +33,5 @@ clean: rm -f mobylinux.iso $(MAKE) -C packages clean $(MAKE) -C kernel clean - docker images -q mobyinitrd:build | xargs docker rmi -f + docker images -q mobyinitrdarm:build | xargs docker rmi -f docker images -q mobyiso:build | xargs docker rmi -f diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml new file mode 100644 index 000000000..1fbe93a46 --- /dev/null +++ b/alpine/docker-compose.yml @@ -0,0 +1,2 @@ +moby: + build: .