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

Some minor cleanup from yelp/fig

Browse source 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
This commit is contained in:
Daniel Nephin 2014-12-11 10:08:39 -08:00
commit 3c0f297ba6
5 changed files with 42 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fig/cli/docker_client.py
View file

@ -31,4 +31,5 @@ def docker_client():
ca_cert=ca_cert,
)
return Client(base_url=base_url, tls=tls_config, version='1.14')
timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)