[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 18/20] docker: add special handling for FROM:debia
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL v3 18/20] docker: add special handling for FROM:debian-%-user targets |
Date: |
Thu, 5 Jul 2018 17:03:27 +0100 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
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
- [Qemu-devel] [PULL v3 10/20] linux-user: introduce preexit_cleanup, (continued)
- [Qemu-devel] [PULL v3 10/20] linux-user: introduce preexit_cleanup, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 13/20] docker: ubuntu: Use SDL2, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 19/20] docker: add special rule for deboostrapped images, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 06/20] docker: add gcovr to travis image, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 08/20] build-system: add clean-coverage target, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 02/20] travis: do not waste time cloning unused submodules, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 07/20] travis: add gcovr summary for GCOV build, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 11/20] linux-user: add gcov support to preexit_cleanup, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 15/20] docker: Do not run tests in 'intermediate' images, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 09/20] build-system: add coverage-report target, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 18/20] docker: add special handling for FROM:debian-%-user targets,
Alex Bennée <=
- [Qemu-devel] [PULL v3 14/20] docker: Clean the MXE base image, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 16/20] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/07/05
- [Qemu-devel] [PULL v3 20/20] docker: add linux-user powered cross builder for QEMU, Alex Bennée, 2018/07/05
- Re: [Qemu-devel] [PULL v3 00/20] Travis, Code Coverage and Cross Build updates, Peter Maydell, 2018/07/05