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

Fail gracefully when -d is not provided for exec command on Win32

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-05-09 16:29:27 -07:00
parent c9fe8920c9
commit e5645595e3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compose/cli/main.py
View File

@ -334,6 +334,13 @@ class TopLevelCommand(object):
""" """
index = int(options.get('--index')) index = int(options.get('--index'))
service = self.project.get_service(options['SERVICE']) service = self.project.get_service(options['SERVICE'])
detach = options['-d']
if IS_WINDOWS_PLATFORM and not detach:
raise UserError(
"Interactive mode is not yet supported on Windows.\n"
"Please pass the -d flag when using `docker-compose exec`."
)
try: try:
container = service.get_container(number=index) container = service.get_container(number=index)
except ValueError as e: except ValueError as e:
@ -350,7 +357,7 @@ class TopLevelCommand(object):
exec_id = container.create_exec(command, **create_exec_options) exec_id = container.create_exec(command, **create_exec_options)
if options['-d']: if detach:
container.start_exec(exec_id, tty=tty) container.start_exec(exec_id, tty=tty)
return return