summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2017-12-14 16:54:33 -0800
committerGitHub <noreply@github.com>2017-12-14 16:54:33 -0800
commit1fd59586d177bf2baa17c7600a2b0465ab364f5e (patch)
tree92e332d85ba2c06c14bd4d67ad49aa34e0c67ad1
parent8cfd4cb39f5d50ee0080e5c038809425784fd516 (diff)
parentb6d0dc1e5a67e39a497052e713df9e478ea15d29 (diff)
downloaddocker-py-1fd59586d177bf2baa17c7600a2b0465ab364f5e.tar.gz
Merge pull request #1837 from feliperuhland/fix_default_api_version
Updated DEFAULT API VERSION in docstrings.
-rw-r--r--docker/api/client.py16
-rw-r--r--docker/client.py4
2 files changed, 10 insertions, 10 deletions
diff --git a/docker/api/client.py b/docker/api/client.py
index 01a83ea..f0a86d4 100644
--- a/docker/api/client.py
+++ b/docker/api/client.py
@@ -63,21 +63,21 @@ class APIClient(
>>> import docker
>>> client = docker.APIClient(base_url='unix://var/run/docker.sock')
>>> client.version()
- {u'ApiVersion': u'1.24',
+ {u'ApiVersion': u'1.33',
u'Arch': u'amd64',
- u'BuildTime': u'2016-09-27T23:38:15.810178467+00:00',
- u'Experimental': True,
- u'GitCommit': u'45bed2c',
- u'GoVersion': u'go1.6.3',
- u'KernelVersion': u'4.4.22-moby',
+ u'BuildTime': u'2017-11-19T18:46:37.000000000+00:00',
+ u'GitCommit': u'f4ffd2511c',
+ u'GoVersion': u'go1.9.2',
+ u'KernelVersion': u'4.14.3-1-ARCH',
+ u'MinAPIVersion': u'1.12',
u'Os': u'linux',
- u'Version': u'1.12.2-rc1'}
+ u'Version': u'17.10.0-ce'}
Args:
base_url (str): URL to the Docker server. For example,
``unix:///var/run/docker.sock`` or ``tcp://127.0.0.1:1234``.
version (str): The version of the API to use. Set to ``auto`` to
- automatically detect the server's version. Default: ``1.26``
+ automatically detect the server's version. Default: ``1.30``
timeout (int): Default timeout for API calls, in seconds.
tls (bool or :py:class:`~docker.tls.TLSConfig`): Enable TLS. Pass
``True`` to enable it with default options, or pass a
diff --git a/docker/client.py b/docker/client.py
index 29968c1..467583e 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -26,7 +26,7 @@ class DockerClient(object):
base_url (str): URL to the Docker server. For example,
``unix:///var/run/docker.sock`` or ``tcp://127.0.0.1:1234``.
version (str): The version of the API to use. Set to ``auto`` to
- automatically detect the server's version. Default: ``1.26``
+ automatically detect the server's version. Default: ``1.30``
timeout (int): Default timeout for API calls, in seconds.
tls (bool or :py:class:`~docker.tls.TLSConfig`): Enable TLS. Pass
``True`` to enable it with default options, or pass a
@@ -60,7 +60,7 @@ class DockerClient(object):
Args:
version (str): The version of the API to use. Set to ``auto`` to
- automatically detect the server's version. Default: ``1.26``
+ automatically detect the server's version. Default: ``1.30``
timeout (int): Default timeout for API calls, in seconds.
ssl_version (int): A valid `SSL version`_.
assert_hostname (bool): Verify the hostname of the server.