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 <alex.bennee@linaro.org>

---
v3
  - don't include stray whitespace fix
---
 tests/docker/docker.py | 4 ++++
 1 file changed, 4 insertions(+)

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()
-- 
2.17.1

On 07/02/2018 11:30 AM, Alex Bennée wrote:
> 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 <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> 
> ---
> v3
>   - don't include stray whitespace fix
> ---
>  tests/docker/docker.py | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> 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()
>