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

Deprecation warning when DOCKER_CLIENT_TIMEOUT is used

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2015-09-02 14:28:57 -07:00
parent 80c9092999
commit e634fe3fd6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compose/cli/docker_client.py
View File

@ -1,9 +1,12 @@
import logging
import os import os
import ssl import ssl
from docker import Client from docker import Client
from docker import tls from docker import tls
log = logging.getLogger(__name__)
def docker_client(): def docker_client():
""" """
@ -34,5 +37,8 @@ def docker_client():
ca_cert=ca_cert, ca_cert=ca_cert,
) )
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))) 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=timeout)