Merge pull request #1645 from dnephin/fix_up_race

Fix race condition in docker-compose up
This commit is contained in:
Aanand Prasad 2015-07-03 16:28:22 +01:00
commit d90202399a

View File

@ -453,7 +453,7 @@ class TopLevelCommand(Command):
service_names = options['SERVICE'] service_names = options['SERVICE']
timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT) timeout = float(options.get('--timeout') or DEFAULT_TIMEOUT)
project.up( to_attach = project.up(
service_names=service_names, service_names=service_names,
start_deps=start_deps, start_deps=start_deps,
allow_recreate=allow_recreate, allow_recreate=allow_recreate,
@ -463,8 +463,6 @@ class TopLevelCommand(Command):
timeout=timeout timeout=timeout
) )
to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
if not detached: if not detached:
print("Attaching to", list_containers(to_attach)) print("Attaching to", list_containers(to_attach))
log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome) log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)