diff options
| author | Joffrey F <joffrey@docker.com> | 2016-09-15 17:59:20 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2016-09-16 11:43:25 -0700 |
| commit | 64517e31fce5293f58295c567bd5487e07b069f4 (patch) | |
| tree | 0765f78765dc0dc9c5a8d7a62640e1452860dcac /compose/cli | |
| parent | 651283eef96a6ab7854b3b8ee57bc25467f27f75 (diff) | |
Force default host on windows to the default TCP host (instead of npipe)
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'compose/cli')
| -rw-r--r-- | compose/cli/docker_client.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py index b196d303..7950c242 100644 --- a/compose/cli/docker_client.py +++ b/compose/cli/docker_client.py @@ -9,6 +9,7 @@ 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 @@ -71,4 +72,9 @@ 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) |