shift rest of these to using compose

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-02-18 15:35:35 +00:00
parent d054f4392d
commit 9669cd10e1
2 changed files with 22 additions and 10 deletions

View File

@ -11,27 +11,25 @@ initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES)
docker-compose run --rm -T moby /bin/mkinitrd.sh > $@ docker-compose run --rm -T moby /bin/mkinitrd.sh > $@
mobylinux.iso: initrd.img Dockerfile.iso isolinux.cfg mobylinux.iso: initrd.img Dockerfile.iso isolinux.cfg
docker build -f Dockerfile.iso -t mobyiso:build . docker-compose run --rm -T iso cat /tmp/output.iso > $@
docker run --rm mobyiso:build cat /tmp/output.iso > $@
arm: initrd-arm.img arm: initrd-arm.img
Dockerfile.armhf: Dockerfile Dockerfile.armhf: Dockerfile
cat Dockerfile | sed 's@FROM alpine@FROM justincormack/armhf-alpine@' | sed 's/syslinux//' \ cat Dockerfile | \
| grep -v 'rc-update add binfmt_misc sysinit' > $@ sed 's@FROM alpine@FROM justincormack/armhf-alpine@' | \
sed 's/syslinux//' | \
grep -v 'rc-update add binfmt_misc sysinit' > $@
initrd-arm.img: Dockerfile.armhf initrd-arm.img: Dockerfile.armhf
rm -f initrd-arm.img rm -f initrd-arm.img
$(MAKE) -C packages arm $(MAKE) -C packages arm
$(MAKE) -C kernel arm $(MAKE) -C kernel arm
cp inittab.armhf etc/inittab cp inittab.armhf etc/inittab
docker build -f Dockerfile.armhf -t mobyinitrdarm:build . docker-compose run --rm -T arm /bin/mkinitrd.sh > $@
docker run --rm mobyinitrdarm:build /bin/mkinitrd.sh > $@
clean: clean:
rm -f initrd.img initrd-arm.img Dockerfile.armhf etc/inittab rm -f initrd.img initrd-arm.img Dockerfile.armhf etc/inittab
rm -f mobylinux.iso rm -f mobylinux.iso
$(MAKE) -C packages clean $(MAKE) -C packages clean
$(MAKE) -C kernel clean $(MAKE) -C kernel clean
docker images -q mobyinitrdarm:build | xargs docker rmi -f
docker images -q mobyiso:build | xargs docker rmi -f

View File

@ -1,2 +1,16 @@
moby: version: '2'
build: . services:
moby:
build:
context: .
network_mode: bridge
arm:
build:
context: .
dockerfile: Dockerfile.armhf
network_mode: bridge
iso:
build:
context: .
dockerfile: Dockerfile.iso
network_mode: bridge