From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCO63-0006aC-JT for qemu-devel@nongnu.org; Mon, 13 Jun 2016 05:23:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCO5y-0006f9-DR for qemu-devel@nongnu.org; Mon, 13 Jun 2016 05:23:50 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:36626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCO5y-0006f5-34 for qemu-devel@nongnu.org; Mon, 13 Jun 2016 05:23:46 -0400 Received: by mail-wm0-x234.google.com with SMTP id n184so69428433wmn.1 for ; Mon, 13 Jun 2016 02:23:46 -0700 (PDT) From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <20160612064745.GM27167@ad.usersys.redhat.com> Date: Mon, 13 Jun 2016 10:24:07 +0100 Message-ID: <87inxd787c.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 2/3] tests/docker/docker.py: support --include-executable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: qemu-devel@nongnu.org, riku.voipio@linaro.org Fam Zheng writes: > On Wed, 06/08 17:35, Alex Bennée wrote: >> When passed the path to a binary we copy it and any linked libraries >> into the docker build context. These can then be included by a >> dockerfile with the line: >> >> # Copy all of context into container >> ADD . / >> >> This is mainly intended for setting up foreign architecture docker >> images which use qemu-$arch to do cross-architecture linux-user >> execution. It also relies on the host and guest file-system following >> reasonable multi-arch layouts so the copied libraries don't clash with >> the guest ones. >> >> Signed-off-by: Alex Bennée >> >> --- >> v2 >> - change name of option >> - require full path to executable >> - clean-up the copy code >> --- >> tests/docker/docker.py | 42 ++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 42 insertions(+) >> >> diff --git a/tests/docker/docker.py b/tests/docker/docker.py >> index ae40bb3..ed6fa45 100755 >> --- a/tests/docker/docker.py >> +++ b/tests/docker/docker.py >> @@ -20,6 +20,7 @@ import atexit >> import uuid >> import argparse >> import tempfile >> +import re >> from shutil import copy, rmtree >> >> def _text_checksum(text): >> @@ -38,6 +39,38 @@ def _guess_docker_command(): >> raise Exception("Cannot find working docker command. Tried:\n%s" % \ >> commands_txt) >> >> +def _copy_with_mkdir(src, root_dir, sub_path): >> + """Copy src into root_dir, creating sub_path as needed.""" >> + dest_dir = os.path.normpath("%s/%s" % (root_dir, sub_path)) >> + try: >> + os.makedirs(dest_dir) >> + except OSError: >> + print "%s already created" % (dest_dir) > > Is this error necessary? If it doesn't hurt (i.e. multiple libraries are copied > into it), I think we can safely say "pass". Or, add "if not > os.path.isdir(dest_dir):" above os.makedirs. OK. > >> + >> + dest_file = "%s/%s" % (dest_dir, os.path.basename(src)) >> + copy(src, dest_file) >> + >> + >> +def _copy_binary_with_libs(src, dest_dir): >> + """Copy a binary executable and all its dependant libraries. >> + >> + This does rely on the host file-system being fairly multi-arch >> + aware so the file don't clash with the guests layout.""" >> + >> + _copy_with_mkdir(src, dest_dir, "/usr/bin") >> + >> + # do ldd bit here >> + ldd_re = re.compile(r"(/.*/)(\S*)") >> + ldd_output = subprocess.check_output(["ldd", src]) >> + for line in ldd_output.split("\n"): >> + search = ldd_re.search(line) >> + if search and len(search.groups()) == 2: >> + so_path = search.groups()[0] >> + so_lib = search.groups()[1] >> + _copy_with_mkdir("%s/%s" % (so_path, so_lib), >> + dest_dir, so_path) >> + >> + >> class Docker(object): >> """ Running Docker commands """ >> def __init__(self): >> @@ -151,6 +184,10 @@ class BuildCommand(SubCommand): >> """ Build docker image out of a dockerfile. Arguments: """ >> name = "build" >> def args(self, parser): >> + parser.add_argument("--include-executable", "-e", >> + help="""Specify a binary that will be copied to the >> + container together with all its dependent >> + libraries""") >> parser.add_argument("tag", >> help="Image Tag") >> parser.add_argument("dockerfile", >> @@ -168,6 +205,11 @@ class BuildCommand(SubCommand): >> # Create a docker context directory for the build >> docker_dir = tempfile.mkdtemp(prefix="docker_build") >> >> + # Do we include a extra binary? > > s/a extra/an extra/ OK > >> + if args.include_executable: >> + _copy_binary_with_libs(args.include_executable, >> + docker_dir) >> + >> dkr.build_image(tag, docker_dir, dockerfile, >> quiet=args.quiet, argv=argv) >> >> -- >> 2.7.4 >> Thanks -- Alex Bennée