Merge branch 'default-cert-path' of https://github.com/aanand/docker-py into aanand-default-cert-path

Conflicts:
	tests/utils_test.py

1 files changed, 7 insertions, 0 deletions

diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index 4c05e0c..d659ca4 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -363,9 +363,15 @@ def kwargs_from_env(ssl_version=None, assert_hostname=None):
     tls_verify = os.environ.get('DOCKER_TLS_VERIFY')
 
     params = {}
+
     if host:
         params['base_url'] = (host.replace('tcp://', 'https://')
                               if tls_verify else host)
+
+    if tls_verify and not cert_path:
+        if 'HOME' in os.environ:
+            cert_path = os.path.join(os.environ['HOME'], '.docker')
+
     if tls_verify and cert_path:
         params['tls'] = tls.TLSConfig(
             client_cert=(os.path.join(cert_path, 'cert.pem'),
@@ -374,6 +380,7 @@ def kwargs_from_env(ssl_version=None, assert_hostname=None):
             verify=True,
             ssl_version=ssl_version,
             assert_hostname=assert_hostname)
+
     return params