github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-14 00:17:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1131 from justincormack/mv-containers

Browse Source 
Move containers directory to top level
This commit is contained in:
Justin Cormack
2017-02-01 23:08:47 +00:00
committed by GitHub
parent 6dfadc6287 2db23f8d18
commit d61ae694d0
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
alpine/Makefile
View File

@@ -19,8 +19,6 @@ 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
@@ -57,10 +55,8 @@ 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) > $@
container.img:
$(MAKE) -j -C containers
tar cf - $$(find containers -name container.tar) | \
docker run --rm --read-only --net=none --log-driver=none --tmpfs /tmp -i $(TARTAR2INITRD_IMAGE) > $@
../containers/container.img:
$(MAKE) -C ../containers
test.img:
$(MAKE) -j -C test
@@ -70,7 +66,7 @@ test.img:
kernel/x86_64/kernel.img:
$(MAKE) -C kernel
initrd.img: moby.img kernel/x86_64/kernel.img container.img
initrd.img: moby.img kernel/x86_64/kernel.img ../containers/container.img
cat $^ > $@
initrd-test.img: initrd.img test.img
@@ -99,10 +95,7 @@ endif
google/cloud-sdk \
gsutil cp -a public-read /gce.img.tar.gz gs://docker-for-gcp-templates/latest/gce.img.tar.gz
common: initrd.img
$(MAKE) -C kernel
$(MAKE) -j -C packages
$(MAKE) -j -C containers
common: initrd.img kernel/x86_64/vmlinuz64
ami: common
tar cf - \
@@ -209,7 +202,6 @@ clean:
docker images -q moby-azure:raw2vhd | xargs docker rmi -f || true
docker volume rm vhdartifact || true
$(MAKE) -C packages clean
$(MAKE) -C containers clean
$(MAKE) -C test clean
$(MAKE) -C kernel clean

10
alpine/containers/Makefile
View File

@@ -1,10 +0,0 @@
DIRS=$(wildcard */)
.PHONY: clean $(DIRS)
default: $(DIRS)
$(DIRS):
$(MAKE) -C $@
clean:
for f in $(DIRS); do $(MAKE) -C $$f clean; done

14
alpine/containers/binfmt/Makefile
View File

@@ -1,14 +0,0 @@
RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc
BINFMT_IMAGE=mobylinux/binfmt:e8e8e984e296148f1339c6cf335f55af2b9541a2@sha256:0c46639794bd6acaa71282dca282d8c113b1a7310b06be02cd850c07116c7d15
default: container.tar
container.tar:
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock $(RIDDLER) \
$(BINFMT_IMAGE) /containers/binfmt --cap-drop all --read-only -v /proc/sys/fs/binfmt_misc:/binfmt_misc $(BINFMT_IMAGE) /usr/bin/binfmt -dir /etc/binfmt.d/ -mount /binfmt_misc >$@
clean:
rm -f container.tar
.DELETE_ON_ERROR:

14
alpine/containers/rng-tools/Makefile
View File

@@ -1,14 +0,0 @@
RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc
RNGD_IMAGE=mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92
default: container.tar
container.tar:
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock $(RIDDLER) \
$(RNGD_IMAGE) /containers/rngd --cap-drop all --cap-add SYS_ADMIN --read-only --oom-score-adj -800 $(RNGD_IMAGE) /bin/tini /usr/sbin/rngd -f >$@
clean:
rm -f container.tar
.DELETE_ON_ERROR: