tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 06:04:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Specifying --tls no longer overrides all other TLS options

Browse Source 
Add an option to skip hostname verification

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-03-17 16:09:45 -07:00
parent 7166408d2a
commit 26f3861791
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compose/cli/docker_client.py
View File

@ -22,14 +22,17 @@ def tls_config_from_options(options):
key = options.get('--tlskey') key = options.get('--tlskey')
verify = options.get('--tlsverify') verify = options.get('--tlsverify')
if tls is True: advanced_opts = any([ca_cert, cert, key, verify])
if tls is True and not advanced_opts:
return True return True
elif any([ca_cert, cert, key, verify]): elif advanced_opts:
client_cert = None client_cert = None
if cert or key: if cert or key:
client_cert = (cert, key) client_cert = (cert, key)
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=options.get('--skip-hostname-check')
) )
else: else:
return None return None

3
compose/cli/main.py
View File

@ -156,6 +156,9 @@ class TopLevelCommand(object):
--tlscert CLIENT_CERT_PATH Path to TLS certificate file --tlscert CLIENT_CERT_PATH Path to TLS certificate file
--tlskey TLS_KEY_PATH Path to TLS key file --tlskey TLS_KEY_PATH Path to TLS key file
--tlsverify Use TLS and verify the remote --tlsverify Use TLS and verify the remote
--skip-hostname-check Don't check the daemon's hostname against the name specified
in the client certificate (for example if your docker host
is an IP address)
Commands: Commands:
build Build or rebuild services build Build or rebuild services