diff --git a/fig/packages/docker/client.py b/fig/packages/docker/client.py index bf09ffeea..c81aa9e32 100644 --- a/fig/packages/docker/client.py +++ b/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 diff --git a/fig/packages/docker/unixconn/unixconn.py b/fig/packages/docker/unixconn/unixconn.py index c9565a251..28068f3c5 100644 --- a/fig/packages/docker/unixconn/unixconn.py +++ b/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): diff --git a/requirements.txt b/requirements.txt index a4de170cb..5dfd7d460 100644 --- a/requirements.txt +++ b/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