diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2018-06-18 15:22:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 15:22:42 -0700 |
| commit | f70545e89a70bf396d5e46732af8df737190cab0 (patch) | |
| tree | 23a417ac42e3f661d39dbd23ebc7fb601c0250f0 /docker/api/client.py | |
| parent | e88751cb9a235f31ec946c199b952b69dcc4cc0b (diff) | |
| parent | e5f56247e3d6f6f0f325aab507d9845ad2c4c097 (diff) | |
| download | docker-py-3.4.0.tar.gz | |
Merge pull request #2062 from docker/3.4.0-release3.4.0
3.4.0 Release
Diffstat (limited to 'docker/api/client.py')
| -rw-r--r-- | docker/api/client.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/api/client.py b/docker/api/client.py index 13c292a..91da1c8 100644 --- a/docker/api/client.py +++ b/docker/api/client.py @@ -83,6 +83,8 @@ class APIClient( :py:class:`~docker.tls.TLSConfig` object to use custom configuration. user_agent (str): Set a custom user agent for requests to the server. + credstore_env (dict): Override environment variables when calling the + credential store process. """ __attrs__ = requests.Session.__attrs__ + ['_auth_configs', @@ -93,7 +95,8 @@ class APIClient( def __init__(self, base_url=None, version=None, timeout=DEFAULT_TIMEOUT_SECONDS, tls=False, - user_agent=DEFAULT_USER_AGENT, num_pools=DEFAULT_NUM_POOLS): + user_agent=DEFAULT_USER_AGENT, num_pools=DEFAULT_NUM_POOLS, + credstore_env=None): super(APIClient, self).__init__() if tls and not base_url: @@ -109,6 +112,7 @@ class APIClient( self._auth_configs = auth.load_config( config_dict=self._general_configs ) + self.credstore_env = credstore_env base_url = utils.parse_host( base_url, IS_WINDOWS_PLATFORM, tls=bool(tls) |