瀏覽代碼

Switch order of connection logic so TCP is tried first

Ben Firshman 12 年之前
父節點
當前提交
d4000e07a9
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      fig/cli/utils.py

+ 3 - 3
fig/cli/utils.py

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