docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow docker host (base_url) to contain a path

This commit is contained in:
Joffrey F 2015-08-17 14:36:19 -07:00
parent 139850f3f3
commit 570693c810
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/utils/utils.py
View File

@ -232,6 +232,7 @@ def parse_host(addr):
proto = "http+unix" proto = "http+unix"
host = DEFAULT_HTTP_HOST host = DEFAULT_HTTP_HOST
port = None port = None
path = ''
if not addr or addr.strip() == 'unix://': if not addr or addr.strip() == 'unix://':
return DEFAULT_UNIX_SOCKET return DEFAULT_UNIX_SOCKET
@ -270,8 +271,12 @@ def parse_host(addr):
if host_parts[0]: if host_parts[0]:
host = host_parts[0] host = host_parts[0]
port = host_parts[1]
if '/' in port:
port, path = port.split('/', 1)
path = '/{0}'.format(path)
try: try:
port = int(host_parts[1]) port = int(port)
except Exception: except Exception:
raise errors.DockerException( raise errors.DockerException(
"Invalid port: %s", addr "Invalid port: %s", addr
@ -285,7 +290,7 @@ def parse_host(addr):
if proto == "http+unix": if proto == "http+unix":
return "{0}://{1}".format(proto, host) return "{0}://{1}".format(proto, host)
return "{0}://{1}:{2}".format(proto, host, port) return "{0}://{1}:{2}{3}".format(proto, host, port, path)
def parse_devices(devices): def parse_devices(devices):