From patchwork Tue Jul 12 15:00:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 71858 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp524037qga; Tue, 12 Jul 2016 08:06:06 -0700 (PDT) X-Received: by 10.237.49.130 with SMTP id 2mr4253753qth.38.1468335966384; Tue, 12 Jul 2016 08:06:06 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s77si1282575qkl.47.2016.07.12.08.06.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Jul 2016 08:06:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMzG9-0006k7-TG for patch@linaro.org; Tue, 12 Jul 2016 11:06:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMzB6-0008Jc-H2 for qemu-devel@nongnu.org; Tue, 12 Jul 2016 11:00:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMzB2-0007kI-HS for qemu-devel@nongnu.org; Tue, 12 Jul 2016 11:00:51 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:36505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMzB2-0007k7-Bl for qemu-devel@nongnu.org; Tue, 12 Jul 2016 11:00:48 -0400 Received: by mail-wm0-x235.google.com with SMTP id f126so130756417wma.1 for ; Tue, 12 Jul 2016 08:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5IU6EvFZH3+hoiQMXNWiosa2pF5SdOlz4P4str8RTZQ=; b=bbcbxUaKeGo5cw1Ba503f08Bq09kxnfYwq0K6fNcPgWppZqW3Bg31mNL7IV3OrH1yp avFOXr1Pn5NYrf2nrKKVPa7TSz2pYhOkLztb6X5l+B1GpCq+HTkgQZ5RsPvcIwGukvWF sMqzUyOkpvp6Fnd6fQ/J2HuHDJHhzjSp3tv28= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5IU6EvFZH3+hoiQMXNWiosa2pF5SdOlz4P4str8RTZQ=; b=WqF2JI5BBqTN/culLcvLww4rZaouZBKjber6zH6ibw5MK2oSaJYslRnQXk85lNMXN+ aZhlDdlJijnPHaZ4yvVoCDr2c0KT65lw959ashjRgPmS1tDpdekwVKTNrZDdp7CXWvjd WFkKcyeC6K2gjfkdQAkrGKRpuPyvxQeY2TFF/1jpJ5L/MzJGVEMx8g/vm7z+Vb4MnrnN El6AdmidMEfwoyG94/rN1v7YYZsEvPwZrl8gcthPziaeNaRzYsn/BjlKd8y5vbAKs4qK dQTveUaujKYFejuxohlLOGriWrNL31CKfUZdZxB2TSXJaec6Ys/lrDxgublAQb2qv8re 0dEQ== X-Gm-Message-State: ALyK8tIDPMVXrmlM+Zzc77EcMkDFZ8LDbZbQqLqDjF1tH+M0fEDQR438QYy3LyqEZ6biP9r9 X-Received: by 10.28.54.229 with SMTP id y98mr18582683wmh.96.1468335647594; Tue, 12 Jul 2016 08:00:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z5sm20308518wme.5.2016.07.12.08.00.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 08:00:45 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 024BA3E0403; Tue, 12 Jul 2016 16:00:49 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Jul 2016 16:00:33 +0100 Message-Id: <1468335639-24582-2-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468335639-24582-1-git-send-email-alex.bennee@linaro.org> References: <1468335639-24582-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH v5 1/7] tests/docker/docker.py: docker_dir outside build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , riku.voipio@linaro.org, famz@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Instead of letting the build_image create the temporary working dir we move the creation to the build command. This is preparation for the later patches where additional files can be added to the build context before the build step is run. We also ensure we remove the build context after we are done (mkdtemp doesn't do this automatically for you). Signed-off-by: Alex Bennée Reviewed-by: Fam Zheng --- v2 - new for v2 v3 - add r-b tag --- tests/docker/docker.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 0151362..ae40bb3 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -20,7 +20,7 @@ import atexit import uuid import argparse import tempfile -from shutil import copy +from shutil import copy, rmtree def _text_checksum(text): """Calculate a digest string unique to the text content""" @@ -87,20 +87,20 @@ class Docker(object): labels = json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") - def build_image(self, tag, dockerfile, df_path, quiet=True, argv=None): + def build_image(self, tag, docker_dir, dockerfile, quiet=True, argv=None): if argv == None: argv = [] - tmp_dir = tempfile.mkdtemp(prefix="docker_build") - tmp_df = tempfile.NamedTemporaryFile(dir=tmp_dir, suffix=".docker") + tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker") tmp_df.write(dockerfile) tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % _text_checksum(dockerfile)) tmp_df.flush() + self._do(["build", "-t", tag, "-f", tmp_df.name] + argv + \ - [tmp_dir], + [docker_dir], quiet=quiet) def image_matches_dockerfile(self, tag, dockerfile): @@ -164,10 +164,15 @@ class BuildCommand(SubCommand): if dkr.image_matches_dockerfile(tag, dockerfile): if not args.quiet: print "Image is up to date." - return 0 + else: + # Create a docker context directory for the build + docker_dir = tempfile.mkdtemp(prefix="docker_build") + + dkr.build_image(tag, docker_dir, dockerfile, + quiet=args.quiet, argv=argv) + + rmtree(docker_dir) - dkr.build_image(tag, dockerfile, args.dockerfile, - quiet=args.quiet, argv=argv) return 0 class CleanCommand(SubCommand):