diff options
author | Joffrey F <joffrey@docker.com> | 2019-01-09 14:38:53 -0800 |
---|---|---|
committer | Joffrey F <joffrey@docker.com> | 2019-01-09 14:45:13 -0800 |
commit | a579e9e20578ca9a074b28865ff594ed02fba6b3 (patch) | |
tree | 24165632ebfe3ca707e4675b0039d31ae3830aed /docker/api/exec_api.py | |
parent | 1073b7364846709ad005e7991045d38365d911c9 (diff) | |
download | docker-py-proxy_env_fixes.tar.gz |
Remove use_config_proxy from exec. Add use_config_proxy docs to DockerClientproxy_env_fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/api/exec_api.py')
-rw-r--r-- | docker/api/exec_api.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/docker/api/exec_api.py b/docker/api/exec_api.py index 830432a..d13b128 100644 --- a/docker/api/exec_api.py +++ b/docker/api/exec_api.py @@ -8,8 +8,7 @@ class ExecApiMixin(object): @utils.check_resource('container') def exec_create(self, container, cmd, stdout=True, stderr=True, stdin=False, tty=False, privileged=False, user='', - environment=None, workdir=None, detach_keys=None, - use_config_proxy=False): + environment=None, workdir=None, detach_keys=None): """ Sets up an exec instance in a running container. @@ -32,10 +31,6 @@ class ExecApiMixin(object): or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`. ~/.docker/config.json is used by default. - use_config_proxy (bool): If ``True``, and if the docker client - configuration file (``~/.docker/config.json`` by default) - contains a proxy configuration, the corresponding environment - variables will be set in the container being created. Returns: (dict): A dictionary with an exec ``Id`` key. @@ -55,9 +50,6 @@ class ExecApiMixin(object): if isinstance(environment, dict): environment = utils.utils.format_environment(environment) - if use_config_proxy: - environment = \ - self._proxy_configs.inject_proxy_environment(environment) data = { 'Container': container, |