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

Switch order of connection logic so TCP is tried first

Browse source
This commit is contained in:
Ben Firshman 2014-01-16 00:58:46 +00:00
commit d4000e07a9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fig/cli/utils.py
View file

@ -93,9 +93,6 @@ def docker_url():
tcp_host = '127.0.0.1' tcp_host = '127.0.0.1'
tcp_port = 4243 tcp_port = 4243
if os.path.exists(socket_path):
return 'unix://%s' % socket_path
for host, port in tcp_hosts: for host, port in tcp_hosts:
try: try:
s = socket.create_connection((host, port), timeout=1) s = socket.create_connection((host, port), timeout=1)
@ -104,6 +101,9 @@ def docker_url():
except: except:
pass pass
if os.path.exists(socket_path):
return 'unix://%s' % socket_path
raise UserError(""" raise UserError("""
Couldn't find Docker daemon - tried: Couldn't find Docker daemon - tried: