mirror of https://github.com/docker/compose.git
Update docker-py version to include match_hostname fix
Removed unnecessary assert_hostname computation in tls_config_from_options Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
parent
7116aefe43
commit
71c86acaa4
|
@ -7,7 +7,6 @@ from docker import Client
|
||||||
from docker.errors import TLSParameterError
|
from docker.errors import TLSParameterError
|
||||||
from docker.tls import TLSConfig
|
from docker.tls import TLSConfig
|
||||||
from docker.utils import kwargs_from_env
|
from docker.utils import kwargs_from_env
|
||||||
from requests.utils import urlparse
|
|
||||||
|
|
||||||
from ..const import HTTP_TIMEOUT
|
from ..const import HTTP_TIMEOUT
|
||||||
from .errors import UserError
|
from .errors import UserError
|
||||||
|
@ -21,16 +20,8 @@ def tls_config_from_options(options):
|
||||||
cert = options.get('--tlscert')
|
cert = options.get('--tlscert')
|
||||||
key = options.get('--tlskey')
|
key = options.get('--tlskey')
|
||||||
verify = options.get('--tlsverify')
|
verify = options.get('--tlsverify')
|
||||||
host = options.get('--host')
|
|
||||||
skip_hostname_check = options.get('--skip-hostname-check', False)
|
skip_hostname_check = options.get('--skip-hostname-check', False)
|
||||||
|
|
||||||
if not skip_hostname_check:
|
|
||||||
hostname = urlparse(host).hostname if host else None
|
|
||||||
# If the protocol is omitted, urlparse fails to extract the hostname.
|
|
||||||
# Make another attempt by appending a protocol.
|
|
||||||
if not hostname and host:
|
|
||||||
hostname = urlparse('tcp://{0}'.format(host)).hostname
|
|
||||||
|
|
||||||
advanced_opts = any([ca_cert, cert, key, verify])
|
advanced_opts = any([ca_cert, cert, key, verify])
|
||||||
|
|
||||||
if tls is True and not advanced_opts:
|
if tls is True and not advanced_opts:
|
||||||
|
@ -40,15 +31,9 @@ def tls_config_from_options(options):
|
||||||
if cert or key:
|
if cert or key:
|
||||||
client_cert = (cert, key)
|
client_cert = (cert, key)
|
||||||
|
|
||||||
assert_hostname = None
|
|
||||||
if skip_hostname_check:
|
|
||||||
assert_hostname = False
|
|
||||||
elif hostname:
|
|
||||||
assert_hostname = hostname
|
|
||||||
|
|
||||||
return TLSConfig(
|
return TLSConfig(
|
||||||
client_cert=client_cert, verify=verify, ca_cert=ca_cert,
|
client_cert=client_cert, verify=verify, ca_cert=ca_cert,
|
||||||
assert_hostname=assert_hostname
|
assert_hostname=False if skip_hostname_check else None
|
||||||
)
|
)
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
PyYAML==3.11
|
PyYAML==3.11
|
||||||
cached-property==1.2.0
|
cached-property==1.2.0
|
||||||
docker-py==1.8.0rc2
|
|
||||||
dockerpty==0.4.1
|
dockerpty==0.4.1
|
||||||
docopt==0.6.1
|
docopt==0.6.1
|
||||||
enum34==1.0.4
|
enum34==1.0.4
|
||||||
|
git+https://github.com/docker/docker-py.git@ac3d4aae2c525b052e661f42307223676ca1b313#egg=docker-py
|
||||||
jsonschema==2.5.1
|
jsonschema==2.5.1
|
||||||
requests==2.7.0
|
requests==2.7.0
|
||||||
six==1.7.3
|
six==1.7.3
|
||||||
|
|
Loading…
Reference in New Issue