From b75799d33a053b6dc99e45721d280e99b21436a6 Mon Sep 17 00:00:00 2001 From: Matthieu Nottale Date: Wed, 14 Mar 2018 14:14:20 +0100 Subject: Add close() method to DockerClient. Signed-off-by: Matthieu Nottale --- docker/client.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docker/client.py') diff --git a/docker/client.py b/docker/client.py index 467583e..b4364c3 100644 --- a/docker/client.py +++ b/docker/client.py @@ -186,6 +186,10 @@ class DockerClient(object): return self.api.version(*args, **kwargs) version.__doc__ = APIClient.version.__doc__ + def close(self): + return self.api.close() + close.__doc__ = APIClient.close.__doc__ + def __getattr__(self, name): s = ["'DockerClient' object has no attribute '{}'".format(name)] # If a user calls a method on APIClient, they -- cgit v1.2.1 From f1189bfb4b1f2ecb6adc77f7349a085bdca1a824 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Fri, 8 Jun 2018 15:14:06 -0700 Subject: Allow passing of env overrides to credstore through APIClient ctor Signed-off-by: Joffrey F --- docker/client.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docker/client.py') diff --git a/docker/client.py b/docker/client.py index b4364c3..8d4a52b 100644 --- a/docker/client.py +++ b/docker/client.py @@ -33,6 +33,8 @@ class DockerClient(object): :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. """ def __init__(self, *args, **kwargs): self.api = APIClient(*args, **kwargs) @@ -66,6 +68,8 @@ class DockerClient(object): assert_hostname (bool): Verify the hostname of the server. environment (dict): The environment to read environment variables from. Default: the value of ``os.environ`` + credstore_env (dict): Override environment variables when calling + the credential store process. Example: @@ -77,8 +81,9 @@ class DockerClient(object): """ timeout = kwargs.pop('timeout', DEFAULT_TIMEOUT_SECONDS) version = kwargs.pop('version', None) - return cls(timeout=timeout, version=version, - **kwargs_from_env(**kwargs)) + return cls( + timeout=timeout, version=version, **kwargs_from_env(**kwargs) + ) # Resources @property -- cgit v1.2.1