Browse Source

Update docker-py

From https://github.com/bfirsh/docker-py/commit/2014572941ade555c465a61af5753cb8c05f17bd
Ben Firshman 11 years ago
parent
commit
21837ac132
3 changed files with 9 additions and 8 deletions
  1. 5 3
      fig/packages/docker/client.py
  2. 1 1
      fig/packages/docker/unixconn/unixconn.py
  3. 3 4
      requirements.txt

+ 5 - 3
fig/packages/docker/client.py

@@ -69,9 +69,11 @@ class Client(requests.Session):
                  timeout=DEFAULT_TIMEOUT_SECONDS):
         super(Client, self).__init__()
         if base_url is None:
-            base_url = "unix://var/run/docker.sock"
-        if base_url.startswith('unix:///'):
+            base_url = "http+unix://var/run/docker.sock"
+        if 'unix:///' in base_url:
             base_url = base_url.replace('unix:/', 'unix:')
+        if base_url.startswith('unix:'):
+            base_url = "http+" + base_url
         if base_url.startswith('tcp:'):
             base_url = base_url.replace('tcp:', 'http:')
         if base_url.endswith('/'):
@@ -81,7 +83,7 @@ class Client(requests.Session):
         self._timeout = timeout
         self._auth_configs = auth.load_config()
 
-        self.mount('unix://', unixconn.UnixAdapter(base_url, timeout))
+        self.mount('http+unix://', unixconn.UnixAdapter(base_url, timeout))
 
     def _set_request_timeout(self, kwargs):
         """Prepare the kwargs for an HTTP request by inserting the timeout

+ 1 - 1
fig/packages/docker/unixconn/unixconn.py

@@ -36,7 +36,7 @@ class UnixHTTPConnection(httplib.HTTPConnection, object):
     def connect(self):
         sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
         sock.settimeout(self.timeout)
-        sock.connect(self.base_url.replace("unix:/", ""))
+        sock.connect(self.base_url.replace("http+unix:/", ""))
         self.sock = sock
 
     def _extract_path(self, url):

+ 3 - 4
requirements.txt

@@ -1,7 +1,6 @@
-requests==1.2.3
-websocket-client==0.11.0
 docopt==0.6.1
 PyYAML==3.10
+requests==2.2.1
+six>=1.3.0
 texttable==0.8.1
-# docker requires six==1.3.0
-six==1.3.0
+websocket-client==0.11.0