Skip to content

Commit 61bab63

Browse files
authored
Merge pull request #2245 from thombashi/fix_api_ver_desc
Fix descriptions of the default API version in docs
2 parents d7772b7 + 6935ce8 commit 61bab63

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docker/api/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class APIClient(
8282
base_url (str): URL to the Docker server. For example,
8383
``unix:///var/run/docker.sock`` or ``tcp://127.0.0.1:1234``.
8484
version (str): The version of the API to use. Set to ``auto`` to
85-
automatically detect the server's version. Default: ``1.30``
85+
automatically detect the server's version. Default: ``1.35``
8686
timeout (int): Default timeout for API calls, in seconds.
8787
tls (bool or :py:class:`~docker.tls.TLSConfig`): Enable TLS. Pass
8888
``True`` to enable it with default options, or pass a

docker/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DockerClient(object):
2626
base_url (str): URL to the Docker server. For example,
2727
``unix:///var/run/docker.sock`` or ``tcp://127.0.0.1:1234``.
2828
version (str): The version of the API to use. Set to ``auto`` to
29-
automatically detect the server's version. Default: ``1.30``
29+
automatically detect the server's version. Default: ``1.35``
3030
timeout (int): Default timeout for API calls, in seconds.
3131
tls (bool or :py:class:`~docker.tls.TLSConfig`): Enable TLS. Pass
3232
``True`` to enable it with default options, or pass a
@@ -62,7 +62,7 @@ def from_env(cls, **kwargs):
6262
6363
Args:
6464
version (str): The version of the API to use. Set to ``auto`` to
65-
automatically detect the server's version. Default: ``1.30``
65+
automatically detect the server's version. Default: ``1.35``
6666
timeout (int): Default timeout for API calls, in seconds.
6767
ssl_version (int): A valid `SSL version`_.
6868
assert_hostname (bool): Verify the hostname of the server.

docker/models/containers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ def run(self, image, command=None, stdout=True, stderr=False,
727727
uts_mode (str): Sets the UTS namespace mode for the container.
728728
Supported values are: ``host``
729729
version (str): The version of the API to use. Set to ``auto`` to
730-
automatically detect the server's version. Default: ``1.30``
730+
automatically detect the server's version. Default: ``1.35``
731731
volume_driver (str): The name of a volume driver/plugin.
732732
volumes (dict or list): A dictionary to configure volumes mounted
733733
inside the container. The key is either the host path or a

0 commit comments

Comments
 (0)