jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HTTP_TIMEOUT as importable constant for consistency

Browse source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2015-09-02 14:52:47 -07:00
commit f9c7346380
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compose/cli/docker_client.py
View file

@ -5,6 +5,8 @@ import ssl
from docker import Client
from docker import tls
from ..const import HTTP_TIMEOUT
log = logging.getLogger(__name__)
@ -39,6 +41,5 @@ def docker_client():
if 'DOCKER_CLIENT_TIMEOUT' in os.environ:
log.warn('The DOCKER_CLIENT_TIMEOUT environment variable is deprecated. Please use COMPOSE_HTTP_TIMEOUT instead.')
timeout = int(os.environ.get('COMPOSE_HTTP_TIMEOUT', os.environ.get('DOCKER_CLIENT_TIMEOUT', 60)))
return Client(base_url=base_url, tls=tls_config, version=api_version, timeout=timeout)
return Client(base_url=base_url, tls=tls_config, version=api_version, timeout=HTTP_TIMEOUT)