Skip to content

Run on windows by bypassing dockerpty. #1900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dopry wants to merge 2 commits into from
Closed

Run on windows by bypassing dockerpty. #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b107912
Run on windows by bypassing dockerpty.
dopry Aug 25, 2015
841c16c
Better error message for AF_UNIX socket exception on windows.
dopry Aug 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion compose/cli/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from inspect import getdoc
from operator import attrgetter

import dockerpty
from docker.errors import APIError

from .. import __version__
Expand All @@ -28,6 +27,9 @@
from .utils import get_version_info
from .utils import yesno

if sys.platform != 'win32':
import dockerpty

log = logging.getLogger(__name__)
console_handler = logging.StreamHandler(sys.stderr)

Expand Down Expand Up @@ -65,6 +67,14 @@ def main():
except NeedsBuildError as e:
log.error("Service '%s' needs to be built, but --no-build was passed." % e.service.name)
sys.exit(1)
except AttributeError as e:
if sys.platform == 'win32':
if str(e) == "'module' object has no attribute 'AF_UNIX'":
log.error('No docker host environment variables specified. '
'Run docker-machine env --help for more info.')
sys.exit(1)
else:
raise


def setup_logging():
Expand Down Expand Up @@ -393,6 +403,13 @@ def run(self, project, options):
if options['-d']:
service.start_container(container)
print(container.name)
elif sys.platform == 'win32':
raise UserError(
'Only detached mode is supported on Windows. You must run '
'compose with the -d option. If you wish to help getting '
'terminal mode support working, PRs are welcome! We need to '
'replace dockerpty or remove its depedency on fcntl.'
)
else:
dockerpty.start(project.client, container.id, interactive=not options['-T'])
exit_code = container.wait()
Expand Down
4 changes: 3 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@ def find_version(*file_paths):
'texttable >= 0.8.1, < 0.9',
'websocket-client >= 0.32.0, < 1.0',
'docker-py >= 1.3.1, < 1.4',
'dockerpty >= 0.3.4, < 0.4',
'six >= 1.3.0, < 2',
'jsonschema >= 2.5.1, < 3',
]

if (sys.platform != 'win32'):
install_requires.append('dockerpty >= 0.3.4, < 0.4')


tests_require = [
'nose',
Expand Down