Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options

Browse source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-03-22 17:27:11 -07:00
parent 402b0157d4
commit f55c9d4201
4 changed files with 53 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compose/cli/command.py
View file

@ -4,7 +4,6 @@ from __future__ import unicode_literals
import logging
import os
import re
import ssl
import six
@ -15,6 +14,7 @@ from ..config.environment import Environment
from ..const import API_VERSIONS
from ..project import Project
from .docker_client import docker_client
from .docker_client import get_tls_version
from .docker_client import tls_config_from_options
from .utils import get_version_info
@ -60,23 +60,6 @@ def get_config_path_from_options(base_dir, options, environment):
return None
def get_tls_version(environment):
compose_tls_version = environment.get('COMPOSE_TLS_VERSION', None)
if not compose_tls_version:
return None
tls_attr_name = "PROTOCOL_{}".format(compose_tls_version)
if not hasattr(ssl, tls_attr_name):
log.warn(
'The "{}" protocol is unavailable. You may need to update your '
'version of Python or OpenSSL. Falling back to TLSv1 (default).'
.format(compose_tls_version)
)
return None
return getattr(ssl, tls_attr_name)
def get_client(environment, verbose=False, version=None, tls_config=None, host=None,
tls_version=None):