[PATCH v1 07/13] tests/docker: move all multiarch containers into dockerfiles.multiarch

[Alex Bennée]

We define multiarch as base distributions that are likely to have
images for any given host architecture.

They will shortly be re-included in the make Makefile.

Signed-off-by: Alex Bennée <address@hidden>
---
 tests/docker/Makefile.include                   |  4 +---
 .../dockerfiles.multiarch/Makefile.include      | 17 +++++++++++++++++
 .../debian10.docker                             |  0
 .../debian9.docker                              |  0
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 tests/docker/dockerfiles.multiarch/Makefile.include
 rename tests/docker/{dockerfiles => dockerfiles.multiarch}/debian10.docker 
(100%)
 rename tests/docker/{dockerfiles => dockerfiles.multiarch}/debian9.docker 
(100%)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 43a8678688..c9e8bc40a1 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -62,8 +62,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
                $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
                "BUILD","$*")
 
-# Special rule for debootstraped binfmt linux-user images
-docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
+docker-binfmt-image-debian-%: $(MULTARCH_BASE)/debian-bootstrap.docker
        $(if $(EXECUTABLE),,\
                $(error EXECUTABLE not set, debootstrap of debian-$* would 
fail))
        $(if $(DEB_ARCH),,\
@@ -85,7 +84,6 @@ docker-binfmt-image-debian-%: 
$(DOCKER_FILES_DIR)/debian-bootstrap.docker
                        $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< ||     
\
                        { echo "You will need to build $(EXECUTABLE)"; exit 
1;},\
                        "CHECK", "debian-$* exists"))
-
 endif
 
 # Enforce dependencies for composite images
diff --git a/tests/docker/dockerfiles.multiarch/Makefile.include 
b/tests/docker/dockerfiles.multiarch/Makefile.include
new file mode 100644
index 0000000000..60617dd7db
--- /dev/null
+++ b/tests/docker/dockerfiles.multiarch/Makefile.include
@@ -0,0 +1,17 @@
+# -*- Mode: makefile -*-
+#
+# Multiarch Containers
+#
+# These containers are ones that will build on any of the major
+# architectures. As a result we can share the rules with whatever
+# system we are installed on.
+#
+
+MULTIARCH_BASE = $(DOCKER_BASE)/dockerfiles.multiarch
+VPATH += $(MULTIARCH_BASE)
+
+#
+# None of the multiarch images can build anything by themselves so
+# they are all BASE containers.
+#
+BASE_CONTAINERS += $(sort $(notdir $(basename $(wildcard 
$(MULTIARCH_BASE)/*.docker))))
diff --git a/tests/docker/dockerfiles/debian10.docker 
b/tests/docker/dockerfiles.multiarch/debian10.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian10.docker
rename to tests/docker/dockerfiles.multiarch/debian10.docker
diff --git a/tests/docker/dockerfiles/debian9.docker 
b/tests/docker/dockerfiles.multiarch/debian9.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian9.docker
rename to tests/docker/dockerfiles.multiarch/debian9.docker
-- 
2.20.1