Stop using volume and compose to build initrd

This makes remote builds work, and simplifies build.

See #469

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-09-06 23:30:59 +01:00
parent 19ca61b8d2
commit 106739fa02
3 changed files with 3 additions and 10 deletions

View File

@ -7,8 +7,8 @@ initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES)
rm -f initrd.img rm -f initrd.img
$(MAKE) -C packages $(MAKE) -C packages
$(MAKE) -C kernel $(MAKE) -C kernel
docker-compose build moby docker build -t moby-initrd:build .
docker-compose run --rm -T moby /bin/mkinitrd.sh docker run --net=none --rm moby-initrd:build /bin/mkinitrd.sh > $@
initrd.img.gz: initrd.img initrd.img.gz: initrd.img
cat initrd.img | gzip -9 > initrd.img.gz cat initrd.img | gzip -9 > initrd.img.gz
@ -66,7 +66,6 @@ azure: common
clean: clean:
rm -f initrd.img initrd.img.gz initrd-arm.img Dockerfile.armhf mobylinux.vhd mobylinux.img 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 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_efi:latest | xargs docker rmi -f || true
docker images -q alpine_bios: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 alpine_arm:latest | xargs docker rmi -f || true

View File

@ -1,11 +1,5 @@
version: '2' version: '2'
services: services:
moby:
build:
context: .
network_mode: bridge
volumes:
- .:/mnt
efi: efi:
cap_add: cap_add:
- sys_admin - sys_admin

View File

@ -35,4 +35,4 @@ printf 'moby' > /tmp/etc/hostname
rm /tmp/bin/mkinitrd.sh rm /tmp/bin/mkinitrd.sh
cd /tmp cd /tmp
find . | cpio -H newc -o > /mnt/initrd.img find . | cpio -H newc -o