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

Exit gracefully when requests encounter a ReadTimeout exception.

Browse source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2015-09-02 11:53:37 -07:00
commit b54b932b54
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compose/cli/docker_client.py
View file

@ -34,5 +34,5 @@ def docker_client():
ca_cert=ca_cert,
)
timeout = int(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)