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

Adding ssl_version to docker_clients kwargs

Browse Source 
Select tls version based of COMPOSE_TLS_VERSION

Changed from SSL to TLS

Also did docs - missing default value

Using getattr and raises AttributeError in case of unsupported version

Signed-off-by: Kalle Møller <github.com@k-moeller.dk>
This commit is contained in:
Kalle Møller 2016-03-14 01:54:15 +01:00
parent d5ef0dfa92
commit 7fc40dd7cc
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compose/cli/command.py
View File

@ -4,6 +4,7 @@ from __future__ import unicode_literals
import logging import logging
import os import os
import re import re
import ssl
import six import six
@ -37,8 +38,8 @@ def get_config_path_from_options(options):
return None return None
def get_client(verbose=False, version=None): def get_client(verbose=False, version=None, tls_version=None):
client = docker_client(version=version) client = docker_client(version=version, tls_version=tls_version)
if verbose: if verbose:
version_info = six.iteritems(client.version()) version_info = six.iteritems(client.version())
log.info(get_version_info('full')) log.info(get_version_info('full'))
@ -57,7 +58,15 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False)
api_version = os.environ.get( api_version = os.environ.get(
'COMPOSE_API_VERSION', 'COMPOSE_API_VERSION',
API_VERSIONS[config_data.version]) API_VERSIONS[config_data.version])
client = get_client(verbose=verbose, version=api_version) compose_tls_version = os.environ.get(
'COMPOSE_TLS_VERSION',
None)
tls_version = None
if compose_tls_version:
tls_version = ssl.getattr("PROTOCOL_{}".format(compose_tls_version))
client = get_client(verbose=verbose, version=api_version, tls_version=tls_version)
return Project.from_config(project_name, config_data, client) return Project.from_config(project_name, config_data, client)

4
compose/cli/docker_client.py
View File

@ -14,7 +14,7 @@ from .errors import UserError
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def docker_client(version=None): def docker_client(version=None, tls_version=None):
""" """
Returns a docker-py client configured using environment variables Returns a docker-py client configured using environment variables
according to the same logic as the official Docker client. according to the same logic as the official Docker client.
@ -24,7 +24,7 @@ def docker_client(version=None):
"Please use COMPOSE_HTTP_TIMEOUT instead.") "Please use COMPOSE_HTTP_TIMEOUT instead.")
try: try:
kwargs = kwargs_from_env(assert_hostname=False) kwargs = kwargs_from_env(assert_hostname=False, ssl_version=tls_version)
except TLSParameterError: except TLSParameterError:
raise UserError( raise UserError(
"TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY " "TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY "

4
docs/reference/envvars.md
View File

@ -75,6 +75,10 @@ Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TL
Configures the time (in seconds) a request to the Docker daemon is allowed to hang before Compose considers Configures the time (in seconds) a request to the Docker daemon is allowed to hang before Compose considers
it failed. Defaults to 60 seconds. it failed. Defaults to 60 seconds.
## COMPOSE\_TLS\_VERSION
Configure which TLS version is used for TLS communication with the `docker` daemon, defaults to `TBD`
Can be `TLSv1`, `TLSv1_1`, `TLSv1_2`.
## Related Information ## Related Information