mirror of https://github.com/docker/docker-py.git
Merge c71100f208 into 6e6a273573
This commit is contained in:
commit
e0e2840cb3
|
|
@ -90,11 +90,13 @@ class DockerClient:
|
||||||
timeout = kwargs.pop('timeout', DEFAULT_TIMEOUT_SECONDS)
|
timeout = kwargs.pop('timeout', DEFAULT_TIMEOUT_SECONDS)
|
||||||
max_pool_size = kwargs.pop('max_pool_size', DEFAULT_MAX_POOL_SIZE)
|
max_pool_size = kwargs.pop('max_pool_size', DEFAULT_MAX_POOL_SIZE)
|
||||||
version = kwargs.pop('version', None)
|
version = kwargs.pop('version', None)
|
||||||
|
credstore_env = kwargs.pop('credstore_env', None)
|
||||||
use_ssh_client = kwargs.pop('use_ssh_client', False)
|
use_ssh_client = kwargs.pop('use_ssh_client', False)
|
||||||
return cls(
|
return cls(
|
||||||
timeout=timeout,
|
timeout=timeout,
|
||||||
max_pool_size=max_pool_size,
|
max_pool_size=max_pool_size,
|
||||||
version=version,
|
version=version,
|
||||||
|
credstore_env=credstore_env,
|
||||||
use_ssh_client=use_ssh_client,
|
use_ssh_client=use_ssh_client,
|
||||||
**kwargs_from_env(**kwargs)
|
**kwargs_from_env(**kwargs)
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue