From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQD6-0002oC-1M for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:17:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPQD3-0007mv-6n for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:16:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQD2-0007mo-Ud for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:16:57 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9ADAA7F342 for ; Tue, 19 Jul 2016 08:16:56 +0000 (UTC) Received: from ad.usersys.redhat.com (dhcp-14-122.nay.redhat.com [10.66.14.122]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6J8Gqt2015076 for ; Tue, 19 Jul 2016 04:16:55 -0400 From: Fam Zheng Date: Tue, 19 Jul 2016 16:16:42 +0800 Message-Id: <1468916208-18668-3-git-send-email-famz@redhat.com> In-Reply-To: <1468916208-18668-1-git-send-email-famz@redhat.com> References: <1468916208-18668-1-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 2/8] tests/docker/docker.py: support --include-executable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Alex Benn=C3=A9e When passed the path to a binary we copy it and any linked libraries (if it is dynamically linked) 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=C3=A9e Message-id: 1468335639-24582-3-git-send-email-alex.bennee@linaro.org --- tests/docker/docker.py | 58 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 file changed, 58 insertions(+) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index ae40bb3..96d906e 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 =20 def _text_checksum(text): @@ -38,6 +39,54 @@ def _guess_docker_command(): raise Exception("Cannot find working docker command. Tried:\n%s" % \ commands_txt) =20 +def _copy_with_mkdir(src, root_dir, sub_path): + """Copy src into root_dir, creating sub_path as needed.""" + dest_dir =3D os.path.normpath("%s/%s" % (root_dir, sub_path)) + try: + os.makedirs(dest_dir) + except OSError: + # we can safely ignore already created directories + pass + + dest_file =3D "%s/%s" % (dest_dir, os.path.basename(src)) + copy(src, dest_file) + + +def _get_so_libs(executable): + """Return a list of libraries associated with an executable. + + The paths may be symbolic links which would need to be resolved to + ensure theright data is copied.""" + + libs =3D [] + ldd_re =3D re.compile(r"(/.*/)(\S*)") + try: + ldd_output =3D subprocess.check_output(["ldd", executable]) + for line in ldd_output.split("\n"): + search =3D ldd_re.search(line) + if search and len(search.groups()) =3D=3D 2: + so_path =3D search.groups()[0] + so_lib =3D search.groups()[1] + libs.append("%s/%s" % (so_path, so_lib)) + except subprocess.CalledProcessError: + print "%s had no associated libraries (static build?)" % (execut= able) + + return libs + +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") + + libs =3D _get_so_libs(src) + if libs: + for l in libs: + so_path =3D os.path.dirname(l) + _copy_with_mkdir(l , dest_dir, so_path) + class Docker(object): """ Running Docker commands """ def __init__(self): @@ -151,6 +200,10 @@ class BuildCommand(SubCommand): """ Build docker image out of a dockerfile. Arguments: """ name =3D "build" def args(self, parser): + parser.add_argument("--include-executable", "-e", + help=3D"""Specify a binary that will be copi= ed to the + container together with all its dependent + libraries""") parser.add_argument("tag", help=3D"Image Tag") parser.add_argument("dockerfile", @@ -168,6 +221,11 @@ class BuildCommand(SubCommand): # Create a docker context directory for the build docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") =20 + # Do we include a extra binary? + if args.include_executable: + _copy_binary_with_libs(args.include_executable, + docker_dir) + dkr.build_image(tag, docker_dir, dockerfile, quiet=3Dargs.quiet, argv=3Dargv) =20 --=20 2.7.4