From 69346b6cf4aa9d60151d0c15670b77d753d03557 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sat, 4 Feb 2017 14:47:00 +0100 Subject: [PATCH] Explicitly build the containers we want in alpine/ directory This will be kept for editions until the new fully containerised version can replace it. Signed-off-by: Justin Cormack --- alpine/Makefile | 8 ++++++-- containers/Makefile | 9 +-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/alpine/Makefile b/alpine/Makefile index 1ceb76b4b..fdf254a59 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -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 diff --git a/containers/Makefile b/containers/Makefile index abb38f494..d83a72eec 100644 --- a/containers/Makefile +++ b/containers/Makefile @@ -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