diff options
| author | Philippe Mathieu-Daudé | 2017-03-06 21:55:20 +0100 |
|---|---|---|
| committer | Fam Zheng | 2017-03-07 11:20:40 +0100 |
| commit | 06cc3551714f2c9ee0d12f78a2ecd7e21b484fc8 (patch) | |
| tree | 4810ff7ef04df6ad865fd0af3e0bc059be26045d /tests | |
| parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
| download | qemu-06cc3551714f2c9ee0d12f78a2ecd7e21b484fc8.tar.gz qemu-06cc3551714f2c9ee0d12f78a2ecd7e21b484fc8.tar.xz qemu-06cc3551714f2c9ee0d12f78a2ecd7e21b484fc8.zip | |
tests/docker: support proxy / corporate firewall
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é <f4bug@amsat.org>
Message-Id: <20170306205520.32311-1-f4bug@amsat.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/docker/docker.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 9fd32ab5fa..8747f6a440 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -28,6 +28,9 @@ 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 +275,9 @@ class BuildCommand(SubCommand): _copy_binary_with_libs(args.include_executable, docker_dir) + argv += ["--build-arg=" + k.lower() + "=" + v + for k, v in os.environ.iteritems() + if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, dockerfile, quiet=args.quiet, user=args.user, argv=argv) |