[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 18/20] docker: add special handling for FROM:debi
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v3 18/20] docker: add special handling for FROM:debian-%-user targets |
Date: |
Mon, 2 Jul 2018 15:30:19 +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>
---
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
- Re: [Qemu-devel] [PATCH v3 20/20] docker: add linux-user powered cross builder for QEMU, (continued)
- [Qemu-devel] [PATCH v3 16/20] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 12/20] docker: ubuntu: Update the package list before installing new ones, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 19/20] docker: add special rule for deboostrapped images, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 15/20] docker: Do not run tests in 'intermediate' images, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 18/20] docker: add special handling for FROM:debian-%-user targets,
Alex Bennée <=
- Re: [Qemu-devel] [PATCH v3 00/20] Travis, Code Coverage and Cross Build updates, no-reply, 2018/07/02