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

Merge pull request #1007 from KingsleyKelly/force

Browse Source 
Add -f flag as option on rm.
This commit is contained in:
Aanand Prasad 2015-03-02 11:26:28 +00:00
commit f89f9e3190
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/cli/main.py
View File

@ -238,7 +238,7 @@ class TopLevelCommand(Command):
Usage: rm [options] [SERVICE...] Usage: rm [options] [SERVICE...]
Options: Options:
--force Don't ask to confirm removal -f, --force Don't ask to confirm removal
-v Remove volumes associated with containers -v Remove volumes associated with containers
""" """
all_containers = project.containers(service_names=options['SERVICE'], stopped=True) all_containers = project.containers(service_names=options['SERVICE'], stopped=True)

6
tests/integration/cli_test.py
View File

@ -295,6 +295,12 @@ class CLITestCase(DockerClientTestCase):
self.assertEqual(len(service.containers(stopped=True)), 1) self.assertEqual(len(service.containers(stopped=True)), 1)
self.command.dispatch(['rm', '--force'], None) self.command.dispatch(['rm', '--force'], None)
self.assertEqual(len(service.containers(stopped=True)), 0) self.assertEqual(len(service.containers(stopped=True)), 0)
service = self.project.get_service('simple')
service.create_container()
service.kill()
self.assertEqual(len(service.containers(stopped=True)), 1)
self.command.dispatch(['rm', '-f'], None)
self.assertEqual(len(service.containers(stopped=True)), 0)
def test_kill(self): def test_kill(self):
self.command.dispatch(['up', '-d'], None) self.command.dispatch(['up', '-d'], None)