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

Merge pull request #3466 from shin-/3330-rm-all-default

Browse Source 
Update rm command to always remove one-off containers.
This commit is contained in:
Aanand Prasad 2016-05-19 16:46:31 +01:00
commit ce8df9e789
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compose/cli/main.py
View File

@ -532,17 +532,15 @@ class TopLevelCommand(object):
Options: Options:
-f, --force Don't ask to confirm removal -f, --force Don't ask to confirm removal
-v Remove any anonymous volumes attached to containers -v Remove any anonymous volumes attached to containers
-a, --all Also remove one-off containers created by -a, --all Obsolete. Also remove one-off containers created by
docker-compose run docker-compose run
""" """
if options.get('--all'): if options.get('--all'):
one_off = OneOffFilter.include
else:
log.warn( log.warn(
'Not including one-off containers created by `docker-compose run`.\n' '--all flag is obsolete. This is now the default behavior '
'To include them, use `docker-compose rm --all`.\n' 'of `docker-compose rm`'
'This will be the default behavior in the next version of Compose.\n') )
one_off = OneOffFilter.exclude one_off = OneOffFilter.include
all_containers = self.project.containers( all_containers = self.project.containers(
service_names=options['SERVICE'], stopped=True, one_off=one_off service_names=options['SERVICE'], stopped=True, one_off=one_off

2
tests/acceptance/cli_test.py
View File

@ -1192,8 +1192,6 @@ class CLITestCase(DockerClientTestCase):
self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 1) self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 1)
self.dispatch(['rm', '-f'], None) self.dispatch(['rm', '-f'], None)
self.assertEqual(len(service.containers(stopped=True)), 0) self.assertEqual(len(service.containers(stopped=True)), 0)
self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 1)
self.dispatch(['rm', '-f', '-a'], None)
self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 0) self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 0)
service.create_container(one_off=False) service.create_container(one_off=False)