diff options
| author | Corentin Henry <corentinhenry@gmail.com> | 2018-12-15 14:16:56 +0100 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2019-01-09 11:30:58 -0800 |
| commit | 9146dd57d7a71f830a4845b9ecd52d561dee29ef (patch) | |
| tree | 11f593b393a1d3cd36ed33b6b5fdeb4a1849b9a3 | |
| parent | 708ef6d81ebd12d997b8bca5481541655cbfa61d (diff) | |
| download | docker-py-9146dd57d7a71f830a4845b9ecd52d561dee29ef.tar.gz | |
code style improvement
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| -rw-r--r-- | docker/api/build.py | 8 |
1 files 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'): |