Move containers directory to top level

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-02-01 22:56:55 +00:00
parent 59947ad010
commit 364a7bb0fe
6 changed files with 22 additions and 22 deletions

17
containers/Makefile Normal file
View File

@@ -0,0 +1,17 @@
TARTAR2INITRD_IMAGE=mobylinux/tartar2initrd:d56cde1558e3080e59a32e3cd7c7141baa601811@sha256:e1ad4522ff906d339da5f250b9ef6bffa5a70b4dec7d2cf7f7dbd0447b79352f
DIRS=$(wildcard */)
.PHONY: clean $(DIRS)
default: container.img
$(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

View File

@@ -0,0 +1,14 @@
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:

View File

@@ -0,0 +1,14 @@
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: