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

Merge pull request #7720 from aiordache/context_bug

Browse Source 
Pass context to docker cli
This commit is contained in:
Anca Iordache 2020-09-01 15:16:24 +02:00 committed by GitHub
commit 155eb91259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compose/cli/main.py
View File

@ -1439,6 +1439,7 @@ def call_docker(args, dockeropts, environment):
key = dockeropts.get('--tlskey') key = dockeropts.get('--tlskey')
verify = dockeropts.get('--tlsverify') verify = dockeropts.get('--tlsverify')
host = dockeropts.get('--host') host = dockeropts.get('--host')
context = dockeropts.get('--context')
tls_options = [] tls_options = []
if tls: if tls:
tls_options.append('--tls') tls_options.append('--tls')
@ -1454,6 +1455,10 @@ def call_docker(args, dockeropts, environment):
tls_options.extend( tls_options.extend(
['--host', re.sub(r'^https?://', 'tcp://', host.lstrip('='))] ['--host', re.sub(r'^https?://', 'tcp://', host.lstrip('='))]
) )
if context:
tls_options.extend(
['--context', context]
)
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)))