Message ID | 20180621062605.941-53-alex.bennee@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="U0e4/e2/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41BBmt5J2Lz9s0W for <incoming@patchwork.ozlabs.org>; Thu, 21 Jun 2018 16:36:30 +1000 (AEST) Received: from localhost ([::1]:53287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fVtCm-0008PU-BD for incoming@patchwork.ozlabs.org; Thu, 21 Jun 2018 02:36:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVt32-00015Q-Mx for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVt31-0000jv-RR for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:24 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33203) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVt31-0000jT-Kc for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:23 -0400 Received: by mail-wm0-x242.google.com with SMTP id z6-v6so1884783wma.0 for <qemu-devel@nongnu.org>; Wed, 20 Jun 2018 23:26:23 -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=F6UTTcvzSadnIxpyUoEdQHuXtK4WMtNIOyrUPedwV4s=; b=U0e4/e2/G1GIBsWnI+vfdsW6sFsrgpJHDyA0BXX5JoDIKVfSfC89EI48wSRfgBDarE jLV56WfyRXpv9Qg8iHw9muHmkNUknOsLt7lqMpghnHEhT+NeErd0eJpNLphdK95BidbX NDbQgCYGbICYst1sjwFlrkVGJZ5cU4WN6gv5o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F6UTTcvzSadnIxpyUoEdQHuXtK4WMtNIOyrUPedwV4s=; b=DaqOlypR4OAGOvvk3ia5K9I3acUV/OJlASsHURsx0n16hxwe+JKy9DEvAGWRN2DslT X+t+lDLL6P/aLyeHTfOS5IhfRLVgfDbcHiaeIRNBEamweioF9G20uuBYfgUiUTOEYr9Z gkzWLohM83T+pI9M2daBjaRpaOh+G743TIwqzsX2ikrqRi5FP+iO73s20yL4UofDezXq FPNJ8LLlZbNcbBaYdGUuo2GLWnuR8TF724YCb7w/veVD+P/135IGLFiKneeZuqrMB3ld 2//70GwPz2rxywKQxKIsDvJ+WfPF6AhH8/q8nVR77+2tovNajCL5qtUILUek4CLL1+FI roqg== X-Gm-Message-State: APt69E0+oPkr0AZ2OfrLjnurfyRL6y2I8ed3Bwo5PFMk6nDJHJpHXPxd FNfNf5jkwpwhx9nyqdQW/IPWRg== X-Google-Smtp-Source: ADUXVKJuzR07I+oiXmWA1jf0b5KdTjMz0Yojn5EA2NQvcFMsbidQep2FwS+NTjYuPPigkYzeWY2dxA== X-Received: by 2002:a1c:88c9:: with SMTP id k192-v6mr4125961wmd.125.1529562382596; Wed, 20 Jun 2018 23:26:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d3-v6sm3851580wrr.90.2018.06.20.23.26.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:26:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BD21A3E150E; Thu, 21 Jun 2018 07:26:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:26:00 +0100 Message-Id: <20180621062605.941-53-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL v2 52/57] docker: docker.py don't conflate checksums for extra_files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,v2,01/57] docker: docker.py wrap StringIO import for python3
|
expand
|
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index e6437d64a7..6a9f2f224b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -206,8 +206,10 @@ class Docker(object): tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % - _text_checksum("\n".join([dockerfile] + - extra_files_cksum))) + _text_checksum(_dockerfile_preprocess(dockerfile))) + for f, c in extra_files_cksum: + tmp_df.write("LABEL com.qemu.%s-checksum=%s" % (f, c)) + tmp_df.flush() self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \ @@ -322,7 +324,7 @@ class BuildCommand(SubCommand): _copy_binary_with_libs(args.include_executable, docker_dir) for filename in args.extra_files or []: _copy_with_mkdir(filename, docker_dir) - cksum += [_file_checksum(filename)] + cksum += [(filename, _file_checksum(filename))] argv += ["--build-arg=" + k.lower() + "=" + v for k, v in os.environ.iteritems()