mirror of
https://github.com/docker/compose.git
synced 2025-07-19 19:54:28 +02:00
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:
parent
631f5be02f
commit
8ed7dfef6f
@ -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
|
||||
|
@ -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()
|
||||
|
Loading…
x
Reference in New Issue
Block a user