diff --git a/alpine/Makefile b/alpine/Makefile index 9f6c91ec5..253ff0776 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -7,8 +7,8 @@ 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 @@ -66,7 +66,6 @@ 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 diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml index 880263a6f..939303ee6 100644 --- a/alpine/docker-compose.yml +++ b/alpine/docker-compose.yml @@ -1,11 +1,5 @@ version: '2' services: - moby: - build: - context: . - network_mode: bridge - volumes: - - .:/mnt efi: cap_add: - sys_admin 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