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

If tcp host is provided while TLS is enabled, convert to https 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-03-17 16:18:37 -07:00
parent 41acd70fd4
commit 3168149cbf
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/utils/utils.py
View File

@ -400,11 +400,12 @@ def parse_host(addr, platform=None, tls=False):
if addr == 'tcp://': if addr == 'tcp://':
raise errors.DockerException( raise errors.DockerException(
"Invalid bind address format: {0}".format(addr)) "Invalid bind address format: {0}".format(addr)
)
elif addr.startswith('unix://'): elif addr.startswith('unix://'):
addr = addr[7:] addr = addr[7:]
elif addr.startswith('tcp://'): elif addr.startswith('tcp://'):
proto = "http" proto = 'http{0}'.format('s' if tls else '')
addr = addr[6:] addr = addr[6:]
elif addr.startswith('https://'): elif addr.startswith('https://'):
proto = "https" proto = "https"

7
tests/unit/utils_test.py
View File

@ -412,7 +412,12 @@ class ParseHostTest(base.BaseTestCase):
def test_parse_host_tls(self): def test_parse_host_tls(self):
host_value = 'myhost.docker.net:3348' host_value = 'myhost.docker.net:3348'
expected_result = 'https://myhost.docker.net:3348' expected_result = 'https://myhost.docker.net:3348'
self.assertEqual(parse_host(host_value, None, True), expected_result) assert parse_host(host_value, tls=True) == expected_result
def test_parse_host_tls_tcp_proto(self):
host_value = 'tcp://myhost.docker.net:3348'
expected_result = 'https://myhost.docker.net:3348'
assert parse_host(host_value, tls=True) == expected_result
class ParseRepositoryTagTest(base.BaseTestCase): class ParseRepositoryTagTest(base.BaseTestCase):