tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6346 from collin5/b5469

Browse Source 
Show failed services 'docker-compose start' when containers are not availabe
This commit is contained in:
Joffrey F 2018-12-10 15:39:16 -08:00 committed by GitHub
commit 14e7a11b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compose/parallel.py
View File

@ -50,7 +50,11 @@ def parallel_execute_watch(events, writer, errors, results, msg, get_name):
error_to_reraise = None
for obj, result, exception in events:
if exception is None:
writer.write(msg, get_name(obj), 'done', green)
if callable(getattr(obj, 'containers', None)) and not obj.containers():
# If service has no containers started
writer.write(msg, get_name(obj), 'failed', red)
else:
writer.write(msg, get_name(obj), 'done', green)
results.append(result)
elif isinstance(exception, ImageNotFound):
# This is to bubble up ImageNotFound exceptions to the client so we

1
tests/acceptance/cli_test.py
View File

@ -2228,6 +2228,7 @@ class CLITestCase(DockerClientTestCase):
def test_start_no_containers(self):
result = self.dispatch(['start'], returncode=1)
assert 'failed' in result.stderr
assert 'No containers to start' in result.stderr
@v2_only()