From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQD6-0002oX-3b 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 1bPQD4-0007nD-7W for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:16:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45694) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQD4-0007n8-2D for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:16:58 -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 B9C5E804E8 for ; Tue, 19 Jul 2016 08:16:57 +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 u6J8Gqt3015076 for ; Tue, 19 Jul 2016 04:16:57 -0400 From: Fam Zheng Date: Tue, 19 Jul 2016 16:16:43 +0800 Message-Id: <1468916208-18668-4-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 3/8] tests/docker/docker.py: check and run .pre script List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Alex Benn=C3=A9e The docker script will now search for an associated $dockerfile.pre script which gets run in the same build context as the dockerfile will be. This is to support pre-seeding the build context before running the docker build. Signed-off-by: Alex Benn=C3=A9e Message-id: 1468335639-24582-4-git-send-email-alex.bennee@linaro.org --- tests/docker/docker.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 96d906e..b61d934 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -221,6 +221,18 @@ class BuildCommand(SubCommand): # Create a docker context directory for the build docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") =20 + # Is there a .pre file to run in the build context? + docker_pre =3D os.path.splitext(args.dockerfile)[0]+".pre" + if os.path.exists(docker_pre): + rc =3D subprocess.call(os.path.realpath(docker_pre), + cwd=3Ddocker_dir) + if rc =3D=3D 3: + print "Skip" + return 0 + else: + print "%s exited with code %d" % (docker_pre, rc) + return 1 + # Do we include a extra binary? if args.include_executable: _copy_binary_with_libs(args.include_executable, --=20 2.7.4