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

Merge pull request #6297 from docker/6293-cli-protocols 

Only use supported protocols when starting engine CLI subprocess
This commit is contained in:
Joffrey F 2018-10-30 16:31:05 -05:00 committed by GitHub
parent 7925f8cfa8 4368b8ac05
commit 69fe42027a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/cli/main.py
View File

@ -1452,7 +1452,9 @@ def call_docker(args, dockeropts):
if verify: if verify:
tls_options.append('--tlsverify') tls_options.append('--tlsverify')
if host: if host:
tls_options.extend(['--host', host.lstrip('=')]) tls_options.extend(
['--host', re.sub(r'^https?://', 'tcp://', host.lstrip('='))]
)
args = [executable_path] + tls_options + args args = [executable_path] + tls_options + args
log.debug(" ".join(map(pipes.quote, args))) log.debug(" ".join(map(pipes.quote, args)))

8
tests/unit/cli/main_test.py
View File

@ -155,6 +155,14 @@ class TestCallDocker(object):
'docker', '--host', 'tcp://mydocker.net:2333', 'ps' 'docker', '--host', 'tcp://mydocker.net:2333', 'ps'
] ]
def test_with_http_host(self):
with mock.patch('subprocess.call') as fake_call:
call_docker(['ps'], {'--host': 'http://mydocker.net:2333'})
assert fake_call.call_args[0][0] == [
'docker', '--host', 'tcp://mydocker.net:2333', 'ps',
]
def test_with_host_option_shorthand_equal(self): def test_with_host_option_shorthand_equal(self):
with mock.patch('subprocess.call') as fake_call: with mock.patch('subprocess.call') as fake_call:
call_docker(['ps'], {'--host': '=tcp://mydocker.net:2333'}) call_docker(['ps'], {'--host': '=tcp://mydocker.net:2333'})