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

Fix duplicate logging on up/run
(cherry picked from commit e2b790f7328482591863e496de14c825fd3f8a23)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Daniel Nephin 2015-06-08 12:48:46 -04:00 committed by Aanand Prasad
parent 631f5be02f
commit 8ed7dfef6f
2 changed files with 4 additions and 1 deletions

View File

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

View File

@ -199,6 +199,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
@ -216,7 +217,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)
@ -378,6 +379,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()