Stop and remove still-running one-off containers in 'down'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-03-21 18:08:07 +00:00
commit 2bf5e46857
2 changed files with 7 additions and 4 deletions

View file

@ -239,8 +239,8 @@ class Project(object):
return containers
def stop(self, service_names=None, **options):
containers = self.containers(service_names)
def stop(self, service_names=None, one_off=OneOffFilter.exclude, **options):
containers = self.containers(service_names, one_off=one_off)
def get_deps(container):
# actually returning inversed dependencies
@ -274,7 +274,7 @@ class Project(object):
), options)
def down(self, remove_image_type, include_volumes, remove_orphans=False):
self.stop()
self.stop(one_off=OneOffFilter.include)
self.find_orphan_containers(remove_orphans)
self.remove_stopped(v=include_volumes, one_off=OneOffFilter.include)