From: Philippe Mathieu-Daudé <f4...@amsat.org>
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é <f4...@amsat.org>
Message-Id: <20170306205520.32311-1-f4...@amsat.org>
Reviewed-by: Fam Zheng <f...@redhat.com>
Signed-off-by: Fam Zheng <f...@redhat.com>
---
tests/docker/docker.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 9fd32ab..8747f6a 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)
--
2.9.3
