jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3992 from shin-/3701-npipe-windows-default

Browse source 
Use docker-py's default behavior when no explicit host on Windows
This commit is contained in:
Joffrey F 2016-10-06 16:48:35 -07:00 • committed by GitHub
commit bc3ed6dead
2 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compose/cli/docker_client.py
View file

@ -9,7 +9,6 @@ from docker.tls import TLSConfig
from docker.utils import kwargs_from_env
from ..const import HTTP_TIMEOUT
from ..const import IS_WINDOWS_PLATFORM
from .errors import UserError
from .utils import generate_user_agent
from .utils import unquote_path
@ -72,9 +71,4 @@ def docker_client(environment, version=None, tls_config=None, host=None,
kwargs['user_agent'] = generate_user_agent()
if 'base_url' not in kwargs and IS_WINDOWS_PLATFORM:
# docker-py 1.10 defaults to using npipes, but we don't want that
# change in compose yet - use the default TCP connection instead.
kwargs['base_url'] = 'tcp://127.0.0.1:2375'
return Client(**kwargs)