github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 03:34:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #503 from justincormack/make-circular

Browse Source 
fix dependency loop
This commit is contained in:
Justin Cormack 2016-09-13 22:19:36 +01:00 committed by GitHub
commit 0265605a1f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
alpine/Makefile
View File

@ -3,7 +3,9 @@ all: initrd.img mobylinux-efi.iso mobylinux-bios.iso
ETCFILES=etc/issue etc/motd etc/network/interfaces ETCFILES=etc/issue etc/motd etc/network/interfaces
ETCFILES+=etc/inittab etc/fstab ETCFILES+=etc/inittab etc/fstab
initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) common initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES)
$(MAKE) -C kernel
$(MAKE) -j -C packages
tar cf - \ tar cf - \
Dockerfile etc init mkinitrd.sh \ Dockerfile etc init mkinitrd.sh \
-C kernel usr etc sbin lib -C .. \ -C kernel usr etc sbin lib -C .. \
@ -42,19 +44,15 @@ mobylinux-bios.iso: Dockerfile.bios initrd.img kernel/x86_64/vmlinuz64 isolinux.
tar cf - $^ | docker build -t moby-bios:build -f Dockerfile.bios - tar cf - $^ | docker build -t moby-bios:build -f Dockerfile.bios -
docker run --net=none --rm moby-bios:build cat /tmp/mobylinux-bios.iso > $@ docker run --net=none --rm moby-bios:build cat /tmp/mobylinux-bios.iso > $@
common: initrd.img ami: initrd.img
$(MAKE) -C kernel
$(MAKE) -j -C packages
ami: common
docker-compose build ami docker-compose build ami
docker-compose run --rm -T ami clean docker-compose run --rm -T ami clean
docker-compose run --rm -T ami bake docker-compose run --rm -T ami bake
ami-clean-mount: common ami-clean-mount:
docker-compose run --rm -T ami clean-mount docker-compose run --rm -T ami clean-mount
azure: common azure: initrd.img
docker-compose build azure docker-compose build azure
docker-compose run --rm -T azure makeraw docker-compose run --rm -T azure makeraw
docker build -t raw2vhd -f cloud/Dockerfile.raw2vhd cloud docker build -t raw2vhd -f cloud/Dockerfile.raw2vhd cloud