Merge pull request #1525 from aanand/fix-duplicate-logging

Fix duplicate logging on up/run
This commit is contained in:
Daniel Nephin 2015-06-08 12:48:46 -04:00
commit e2b790f732
2 changed files with 4 additions and 1 deletions

View File

@ -336,6 +336,7 @@ class TopLevelCommand(Command):
container_options['ports'] = []
container = service.create_container(
quiet=True,
one_off=True,
insecure_registry=insecure_registry,
**container_options

View File

@ -197,6 +197,7 @@ class Service(object):
do_build=True,
previous_container=None,
number=None,
quiet=False,
**override_options):
"""
Create a container for this service. If the image doesn't exist, attempt to pull
@ -214,7 +215,7 @@ class Service(object):
previous_container=previous_container,
)
if 'name' in container_options:
if 'name' in container_options and not quiet:
log.info("Creating %s..." % container_options['name'])
return Container.create(self.client, **container_options)
@ -376,6 +377,7 @@ class Service(object):
do_build=False,
previous_container=container,
number=container.labels.get(LABEL_CONTAINER_NUMBER),
quiet=True,
)
self.start_container(new_container)
container.remove()