diff --git a/alpine/Makefile b/alpine/Makefile index 9f6c91ec5..0b9d3715d 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -7,21 +7,20 @@ initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) rm -f initrd.img $(MAKE) -C packages $(MAKE) -C kernel - docker-compose build moby - docker-compose run --rm -T moby /bin/mkinitrd.sh + docker build -t moby-initrd:build . + docker run --net=none --rm moby-initrd:build /bin/mkinitrd.sh > $@ initrd.img.gz: initrd.img cat initrd.img | gzip -9 > initrd.img.gz mobylinux-efi.iso: initrd.img.gz Dockerfile.efi - docker-compose build efi - docker-compose run --rm -T efi \ - cp /tmp/efi/mobylinux.efi /tmp/efi/mobylinux-efi.iso /mnt + docker build -t moby-efi:build -f Dockerfile.efi . + docker run --net=none --rm --cap-add sys_admin moby-efi:build cat /tmp/efi/mobylinux.efi > mobylinux.efi + docker run --net=none --rm --cap-add sys_admin moby-efi:build cat /tmp/efi/mobylinux.efi > $@ mobylinux-bios.iso: initrd.img Dockerfile.bios isolinux.cfg - docker-compose build bios - docker-compose run --rm -T bios \ - cp /tmp/mobylinux-bios.iso /mnt + docker build -t moby-bios:build -f Dockerfile.bios . + docker run --net=none --rm moby-bios:build cat /tmp/mobylinux-bios.iso > $@ arm: initrd-arm.img @@ -44,8 +43,8 @@ initrd-arm.img: Dockerfile.armhf rm -f initrd-arm.img $(MAKE) -C packages arm $(MAKE) -C kernel arm - docker-compose build arm - docker-compose run --rm -T arm /bin/mkinitrd.sh > $@ + docker build -t moby-arm:build -f Dockerfile.armhf . + docker run --net=none --rm moby-arm:build /bin/mkinitrd.sh > $@ common: initrd.img $(MAKE) -C kernel @@ -66,10 +65,9 @@ azure: common clean: rm -f initrd.img initrd.img.gz initrd-arm.img Dockerfile.armhf mobylinux.vhd mobylinux.img rm -f mobylinux-bios.iso mobylinux-efi.iso mobylinux.efi - docker images -q alpine_moby:latest | xargs docker rmi -f || true - docker images -q alpine_efi:latest | xargs docker rmi -f || true - docker images -q alpine_bios:latest | xargs docker rmi -f || true - docker images -q alpine_arm:latest | xargs docker rmi -f || true + docker images -q moby-efi:build | xargs docker rmi -f || true + docker images -q moby-bios:build | xargs docker rmi -f || true + docker images -q moby-arm:build | xargs docker rmi -f || true docker images -q alpine_ami:latest | xargs docker rmi -f || true docker images -q alpine_azure:latest | xargs docker rmi -f || true $(MAKE) -C packages clean diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml index 880263a6f..355380911 100644 --- a/alpine/docker-compose.yml +++ b/alpine/docker-compose.yml @@ -1,32 +1,5 @@ version: '2' services: - moby: - build: - context: . - network_mode: bridge - volumes: - - .:/mnt - efi: - cap_add: - - sys_admin - build: - context: . - dockerfile: Dockerfile.efi - network_mode: bridge - volumes: - - .:/mnt - bios: - build: - context: . - dockerfile: Dockerfile.bios - network_mode: bridge - volumes: - - .:/mnt - arm: - build: - context: . - dockerfile: Dockerfile.armhf - network_mode: bridge azure: privileged: true build: diff --git a/alpine/mkinitrd.sh b/alpine/mkinitrd.sh index 6055aa9ec..bb23c3b0d 100755 --- a/alpine/mkinitrd.sh +++ b/alpine/mkinitrd.sh @@ -35,4 +35,4 @@ printf 'moby' > /tmp/etc/hostname rm /tmp/bin/mkinitrd.sh cd /tmp -find . | cpio -H newc -o > /mnt/initrd.img +find . | cpio -H newc -o