From: Alex Bennée Date: Fri, 29 Jun 2018 16:46:49 +0000 (+0100) Subject: docker: add special handling for FROM:debian-%-user targets X-Git-Tag: qemu-xen-4.12.0-rc1~94^2~2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=547cb45ea309dfdbaa8395dcc4c6330899118e56;p=qemu-xen.git docker: add special handling for FROM:debian-%-user targets These will have been build with debootstrap so we need to check against the debian-bootstrap dockerfile. This does mean sticking to debian-FOO-user as the naming conventions for boot-strapped images. The actual cross image is built on top. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- diff --git a/tests/docker/docker.py b/tests/docker/docker.py index b279836154..69e7130db7 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -113,6 +113,10 @@ def _copy_binary_with_libs(src, dest_dir): _copy_with_mkdir(l , dest_dir, so_path) def _read_qemu_dockerfile(img_name): + # special case for Debian linux-user images + if img_name.startswith("debian") and img_name.endswith("user"): + img_name = "debian-bootstrap" + df = os.path.join(os.path.dirname(__file__), "dockerfiles", img_name + ".docker") return open(df, "r").read()