diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/api/container.py | 6 | ||||
| -rw-r--r-- | docker/utils/proxy.py | 16 |
2 files changed, 4 insertions, 18 deletions
diff --git a/docker/api/container.py b/docker/api/container.py index 54f9950..43ae532 100644 --- a/docker/api/container.py +++ b/docker/api/container.py @@ -410,9 +410,11 @@ class ContainerApiMixin(object): if isinstance(environment, dict): environment = utils.utils.format_environment(environment) + if use_config_proxy: - environment = \ - self._proxy_configs.inject_proxy_environment(environment) + environment = self._proxy_configs.inject_proxy_environment( + environment + ) config = self.create_container_config( image, command, hostname, user, detach, stdin_open, tty, diff --git a/docker/utils/proxy.py b/docker/utils/proxy.py index c368116..49e98ed 100644 --- a/docker/utils/proxy.py +++ b/docker/utils/proxy.py @@ -9,34 +9,18 @@ class ProxyConfig(dict): def http(self): return self.get('http') - @http.setter - def http(self, value): - self['http'] = value - @property def https(self): return self.get('https') - @https.setter - def https(self, value): - self['https'] = value - @property def ftp(self): return self.get('ftp') - @ftp.setter - def ftp(self, value): - self['ftp'] = value - @property def no_proxy(self): return self.get('no_proxy') - @no_proxy.setter - def no_proxy(self, value): - self['no_proxy'] = value - @staticmethod def from_dict(config): ''' |