github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1152 from justincormack/mv-test2

Browse Source 
Explicitly build the containers we want in alpine/ directory
This commit is contained in:
Justin Cormack 2017-02-05 08:59:06 +01:00 committed by GitHub
commit 080008de16
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
alpine/Makefile
View File

@ -19,6 +19,8 @@ PAD4_IMAGE=mobylinux/pad4:1edffcbfa13d4795f006d38e871a778ffba03d8a@sha256:1ad269
TAR2INITRD_IMAGE=mobylinux/tar2initrd:d5711601eb5b89de0f052d87365e18388ff3f1b5@sha256:58d377e65845f91400e173ce9fca93462f2f237947eef2b0d2c17bb4f2da5ee8
TARTAR2INITRD_IMAGE=mobylinux/tartar2initrd:d56cde1558e3080e59a32e3cd7c7141baa601811@sha256:e1ad4522ff906d339da5f250b9ef6bffa5a70b4dec7d2cf7f7dbd0447b79352f
GCE_IMAGE=mobylinux/mkimage-gce:83158ebe303a970a3131c3d02ef2ba00ca5e4a14@sha256:51c30fbf946ca9967688a411e7bf69769a22987cd47ad03428491dd1556fcf63
MKIMAGE_BASE=mobylinux/mkimage-base:870f7512498f2ce5feccebe15fb0d03c5c3ebac2@sha256:47d1ed872b6a44f13b61ea80b3eeab4519dc151c7d684a89a53aa26233b4e087
@ -55,8 +57,10 @@ moby.img: Dockerfile etc usr init
docker run --rm --read-only --net=none --log-driver=none --tmpfs /tmp -v /var/run/docker.sock:/var/run/docker.sock $(MKIMAGE_BASE) $$BUILD | \
docker run --rm --read-only --net=none --log-driver=none --tmpfs /tmp -i $(TAR2INITRD_IMAGE) > $@
../containers/container.img:
container.img:
$(MAKE) -C ../containers
tar cf - -C ../containers binfmt/container.tar rng-tools/container.tar | \
docker run --rm --read-only --net=none --log-driver=none --tmpfs /tmp -i $(TARTAR2INITRD_IMAGE) > $@
../test/test.img:
$(MAKE) -C ../test
@ -64,7 +68,7 @@ moby.img: Dockerfile etc usr init
../kernel/x86_64/kernel.img:
$(MAKE) -C ../kernel
initrd.img: moby.img ../kernel/x86_64/kernel.img ../containers/container.img
initrd.img: moby.img ../kernel/x86_64/kernel.img container.img
cat $^ > $@
initrd-test.img: initrd.img ../test/test.img

9
containers/Makefile
View File

@ -1,17 +1,10 @@
TARTAR2INITRD_IMAGE=mobylinux/tartar2initrd:d56cde1558e3080e59a32e3cd7c7141baa601811@sha256:e1ad4522ff906d339da5f250b9ef6bffa5a70b4dec7d2cf7f7dbd0447b79352f
DIRS=$(wildcard */)
.PHONY: clean $(DIRS)
default: container.img
default: $(DIRS)
$(DIRS):
$(MAKE) -C $@
container.img: $(DIRS)
tar cf - $$(find . -name container.tar) | \
docker run --rm --read-only --net=none --log-driver=none --tmpfs /tmp -i $(TARTAR2INITRD_IMAGE) > $@
clean:
for f in $(DIRS); do $(MAKE) -C $$f clean; done
rm -f container.img