From nobody Wed May 8 22:56:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488654801665207.77939197929504; Sat, 4 Mar 2017 11:13:21 -0800 (PST) Received: from localhost ([::1]:36340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckF7H-0004Gm-Mw for importer@patchew.org; Sat, 04 Mar 2017 14:13:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckF6m-0004GP-Lg for qemu-devel@nongnu.org; Sat, 04 Mar 2017 14:12:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckF6h-0004Ys-IV for qemu-devel@nongnu.org; Sat, 04 Mar 2017 14:12:48 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:33509) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ckF6h-0004Yg-Ec for qemu-devel@nongnu.org; Sat, 04 Mar 2017 14:12:43 -0500 Received: by mail-qk0-x244.google.com with SMTP id j127so16997570qke.0 for ; Sat, 04 Mar 2017 11:12:43 -0800 (PST) Received: from yoga.lan ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id p19sm10054472qtp.63.2017.03.04.11.12.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 11:12:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kZrHTgVBvFqmL/rei1eusd48ZYyxeYndIHeZApi46Hk=; b=CtQxNoUeXX1ZYRbIkZQhBw7yNQyBN2511cjEtUjVKr5NPxTfsHjShaqh1eRoZVFvuQ sVIDMcxpQ482Ml6BK0k4I9wPjG3ppTsN2HAROB8dpti0VlaRGl3FjbrK8iSS27IEa3wQ oC5FvV4itPCrohyGdM7GD/93mUzQt27FDAAaoYGwy6PDIKpn0CqrWLT3GDIo0cHc+WT5 OSNi29VNCiUlLZc+FXUpLJtqcrAWeU93aESjC6CEUPn4W0ImgUnT+dOjrEN0Lfe3Hbpc 9WYQljJXIiu7TptHyHsa4yHglnulVyhSlD7sdkQwhm9Ixz9jGm0BmbreksxPZRChp5Kc wSfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=kZrHTgVBvFqmL/rei1eusd48ZYyxeYndIHeZApi46Hk=; b=XSfaSnsgp48zzs/rgCx/mWzUNTINWAyY9YgdWYY6rChZ1OH9x45D6wlTUtJZmNFd7s 04L0hQ+Ic9CkuT16ZG4t+LsyV/TjkD6flV5vBfQzmVS+oLOzW4sIGF9MkZUX1wUvsyjn +qD/NAPM6JaPB/9fb5R7PWKZMMXCihq9bksOB8MAYVn4f5+f9ZLQJwiQmTHl8qnr2Umh ufpzcXe6VqQyQayxgoKsJH0iBK83TNJ7P7egaRn4pOohyhsQozxvYtVmP2u6HUp+ikKY eGUrN6/5oNen/U7HrnA3z1/XmmuEBPVRL1GVXv4Vfp2/wKKU4m5RZ6yTh29wyZKJpP41 Lw9g== X-Gm-Message-State: AMke39n5iAYBjcbcc/nDp7yP6J1J/Hg/EGnnhC/bflFa6rdgv0Rj1ydiv0PNUb5tWUi9hg== X-Received: by 10.200.51.84 with SMTP id u20mr8030770qta.133.1488654762967; Sat, 04 Mar 2017 11:12:42 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 4 Mar 2017 16:12:30 -0300 Message-Id: <20170304191230.11296-1-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH] tests/docker: support proxy / corporate firewall 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?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 if FTP_PROXY/HTTP_PROXY/HTTPS_PROXY standard environment variables availabl= e, pass them to the docker daemon to build images. this is required when building behind corporate proxy/firewall, but also he= lp when using local cache server (ie: apt/yum). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/docker.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 9fd32ab5fa..02bf9363e1 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -22,12 +22,16 @@ import argparse import tempfile import re import signal +import string from tarfile import TarFile, TarInfo from StringIO import StringIO from shutil import copy, rmtree from pwd import getpwuid =20 =20 +FILTERED_ENV_NAMES =3D ['FTP_PROXY', 'HTTP_PROXY', 'HTTPS_PROXY'] + + DEVNULL =3D open(os.devnull, 'wb') =20 =20 @@ -272,6 +276,12 @@ class BuildCommand(SubCommand): _copy_binary_with_libs(args.include_executable, docker_dir) =20 + filtered_keys =3D map(string.upper, FILTERED_ENV_NAMES) + filtered_keys +=3D map(string.lower, FILTERED_ENV_NAMES) + for filtered_key in filtered_keys: + if filtered_key in os.environ.keys(): + argv +=3D ["--build-arg=3D" + filtered_key + + "=3D" + os.environ[filtered_key]] dkr.build_image(tag, docker_dir, dockerfile, quiet=3Dargs.quiet, user=3Dargs.user, argv=3Da= rgv) =20 --=20 2.11.0