From 53399b98be9eec23a47dfa6ad1838b9612cc1c1a Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Mon, 13 Feb 2017 11:10:13 +0000
Subject: [PATCH] Move containers directory to alpine directory

Not using this with new tool, so leave for editions.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 Makefile                                             |  2 --
 alpine/Makefile                                      | 12 +++++++-----
 {containers => alpine/containers}/Makefile           |  0
 {containers => alpine/containers}/binfmt/Makefile    |  0
 {containers => alpine/containers}/rng-tools/Makefile |  0
 {test => alpine/test}/Makefile                       |  0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename {containers => alpine/containers}/Makefile (100%)
 rename {containers => alpine/containers}/binfmt/Makefile (100%)
 rename {containers => alpine/containers}/rng-tools/Makefile (100%)
 rename {test => alpine/test}/Makefile (100%)

diff --git a/Makefile b/Makefile
index af334c55a..9fbba80ce 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,5 @@ ci-pr:
 
 clean:
 	$(MAKE) -C alpine clean
-	$(MAKE) -C containers clean
-	$(MAKE) -C test clean
 	$(MAKE) -C kernel clean
 	rm -rf bin disk.img test.log
diff --git a/alpine/Makefile b/alpine/Makefile
index fdf254a59..8b484db59 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -58,12 +58,12 @@ moby.img: Dockerfile etc usr init
 		docker run --rm --read-only --net=none --log-driver=none --tmpfs /tmp -i $(TAR2INITRD_IMAGE) > $@
 
 container.img:
-	$(MAKE) -C ../containers
-	tar cf - -C ../containers binfmt/container.tar rng-tools/container.tar | \
+	$(MAKE) -C containers
+	tar cf - containers/*/container.tar | \
 		docker run --rm --read-only --net=none --log-driver=none --tmpfs /tmp -i $(TARTAR2INITRD_IMAGE) > $@
 
-../test/test.img:
-	$(MAKE) -C ../test
+test/test.img:
+	$(MAKE) -C test
 
 ../kernel/x86_64/kernel.img:
 	$(MAKE) -C ../kernel
@@ -71,7 +71,7 @@ container.img:
 initrd.img: moby.img ../kernel/x86_64/kernel.img container.img
 	cat $^ > $@
 
-initrd-test.img: initrd.img ../test/test.img
+initrd-test.img: initrd.img test/test.img
 	cat $^ > $@
 
 # outputs tarball of mobylinux-efi.iso mobylinux.efi
@@ -202,5 +202,7 @@ 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
 
 .DELETE_ON_ERROR:
diff --git a/containers/Makefile b/alpine/containers/Makefile
similarity index 100%
rename from containers/Makefile
rename to alpine/containers/Makefile
diff --git a/containers/binfmt/Makefile b/alpine/containers/binfmt/Makefile
similarity index 100%
rename from containers/binfmt/Makefile
rename to alpine/containers/binfmt/Makefile
diff --git a/containers/rng-tools/Makefile b/alpine/containers/rng-tools/Makefile
similarity index 100%
rename from containers/rng-tools/Makefile
rename to alpine/containers/rng-tools/Makefile
diff --git a/test/Makefile b/alpine/test/Makefile
similarity index 100%
rename from test/Makefile
rename to alpine/test/Makefile