From patchwork Sat Mar 4 19:12:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 9604235 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E134601D2 for ; Sat, 4 Mar 2017 19:13:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64DDE2843F for ; Sat, 4 Mar 2017 19:13:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45FBB28447; Sat, 4 Mar 2017 19:13:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AB11F2843F for ; Sat, 4 Mar 2017 19:13:00 +0000 (UTC) Received: from localhost ([::1]:36340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckF6x-0004Gm-4m for patchwork-qemu-devel@patchwork.kernel.org; Sat, 04 Mar 2017 14:12:59 -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) 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) 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) 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 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP if FTP_PROXY/HTTP_PROXY/HTTPS_PROXY standard environment variables available, pass them to the docker daemon to build images. this is required when building behind corporate proxy/firewall, but also help when using local cache server (ie: apt/yum). Signed-off-by: Philippe Mathieu-Daudé --- 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 +FILTERED_ENV_NAMES = ['FTP_PROXY', 'HTTP_PROXY', 'HTTPS_PROXY'] + + DEVNULL = open(os.devnull, 'wb') @@ -272,6 +276,12 @@ class BuildCommand(SubCommand): _copy_binary_with_libs(args.include_executable, docker_dir) + filtered_keys = map(string.upper, FILTERED_ENV_NAMES) + filtered_keys += map(string.lower, FILTERED_ENV_NAMES) + for filtered_key in filtered_keys: + if filtered_key in os.environ.keys(): + argv += ["--build-arg=" + filtered_key + + "=" + os.environ[filtered_key]] dkr.build_image(tag, docker_dir, dockerfile, quiet=args.quiet, user=args.user, argv=argv)