tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove one-off containers in 'docker-compose down'

Browse Source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-03-21 16:15:49 +00:00
parent 81f6d86ad9
commit a2317dfac2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/project.py
View File

@ -276,7 +276,7 @@ class Project(object):
def down(self, remove_image_type, include_volumes, remove_orphans=False): def down(self, remove_image_type, include_volumes, remove_orphans=False):
self.stop() self.stop()
self.find_orphan_containers(remove_orphans) self.find_orphan_containers(remove_orphans)
self.remove_stopped(v=include_volumes) self.remove_stopped(v=include_volumes, one_off=OneOffFilter.include)
self.networks.remove() self.networks.remove()

5
tests/acceptance/cli_test.py
View File

@ -366,14 +366,19 @@ class CLITestCase(DockerClientTestCase):
@v2_only() @v2_only()
def test_down(self): def test_down(self):
self.base_dir = 'tests/fixtures/v2-full' self.base_dir = 'tests/fixtures/v2-full'
self.dispatch(['up', '-d']) self.dispatch(['up', '-d'])
wait_on_condition(ContainerCountCondition(self.project, 2)) wait_on_condition(ContainerCountCondition(self.project, 2))
self.dispatch(['run', 'web', 'true'])
assert len(self.project.containers(one_off=OneOffFilter.only, stopped=True)) == 1
result = self.dispatch(['down', '--rmi=local', '--volumes']) result = self.dispatch(['down', '--rmi=local', '--volumes'])
assert 'Stopping v2full_web_1' in result.stderr assert 'Stopping v2full_web_1' in result.stderr
assert 'Stopping v2full_other_1' in result.stderr assert 'Stopping v2full_other_1' in result.stderr
assert 'Removing v2full_web_1' in result.stderr assert 'Removing v2full_web_1' in result.stderr
assert 'Removing v2full_other_1' in result.stderr assert 'Removing v2full_other_1' in result.stderr
assert 'Removing v2full_web_run_1' in result.stderr
assert 'Removing volume v2full_data' in result.stderr assert 'Removing volume v2full_data' in result.stderr
assert 'Removing image v2full_web' in result.stderr assert 'Removing image v2full_web' in result.stderr
assert 'Removing image busybox' not in result.stderr assert 'Removing image busybox' not in result.stderr