From 9146dd57d7a71f830a4845b9ecd52d561dee29ef Mon Sep 17 00:00:00 2001 From: Corentin Henry Date: Sat, 15 Dec 2018 14:16:56 +0100 Subject: code style improvement Signed-off-by: Corentin Henry --- docker/api/build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/api/build.py b/docker/api/build.py index 0871df8..dab06d5 100644 --- a/docker/api/build.py +++ b/docker/api/build.py @@ -168,11 +168,11 @@ class BuildApiMixin(object): } params.update(container_limits) - final_buildargs = self._proxy_configs.get_environment() + proxy_args = self._proxy_configs.get_environment() + for k, v in proxy_args.items(): + buildargs.setdefault(k, v) if buildargs: - final_buildargs.update(buildargs) - if final_buildargs: - params.update({'buildargs': json.dumps(final_buildargs)}) + params.update({'buildargs': json.dumps(buildargs)}) if shmsize: if utils.version_gte(self._version, '1.22'): -- cgit v1.2.1