tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 21:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update docker-py

Browse Source 
From 2014572941
This commit is contained in:
Ben Firshman 2014-01-28 13:42:18 +00:00
parent c270c13baa
commit 21837ac132
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fig/packages/docker/client.py
View File

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

2
fig/packages/docker/unixconn/unixconn.py
View File

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

7
requirements.txt
View File

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