docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge e78605e23c into db7f8b8bb6

This commit is contained in:
Mateusz Zakarczemny 2025-01-23 10:20:30 +00:00 committed by GitHub
parent db7f8b8bb6 e78605e23c
commit ccbee9489f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/client.py
View File

@ -65,6 +65,11 @@ class DockerClient:
A path to a directory containing TLS certificates to use when A path to a directory containing TLS certificates to use when
connecting to the Docker host. connecting to the Docker host.
.. envvar:: DOCKER_API_VERSION
A path to a directory containing TLS certificates to use when
connecting to the Docker host.
Args: Args:
version (str): The version of the API to use. Set to ``auto`` to version (str): The version of the API to use. Set to ``auto`` to
automatically detect the server's version. Default: ``auto`` automatically detect the server's version. Default: ``auto``

4
docker/utils/utils.py
View File

@ -367,6 +367,8 @@ def kwargs_from_env(environment=None):
tls_verify = tls_verify is not None tls_verify = tls_verify is not None
enable_tls = cert_path or tls_verify enable_tls = cert_path or tls_verify
docker_api_version = environment.get('DOCKER_API_VERSION')
params = {} params = {}
if host: if host:
@ -385,6 +387,8 @@ def kwargs_from_env(environment=None):
verify=tls_verify, verify=tls_verify,
) )
params['version'] = docker_api_version
return params return params