Remove anonymous volumes when using run --rm.

Named volumes will not be removed.
This is consistent with the behavior of docker run --rm.

Fixes #2419, #3611

compose/cli/main.py

@@ -947,7 +947,7 @@ def run_one_off_container(container_options, project, service, options):
 
     def remove_container(force=False):
         if options['--rm']:
-            project.client.remove_container(container.id, force=True)
+            project.client.remove_container(container.id, force=True, v=True)
 
     signals.set_signal_handler_to_shutdown()
     try:

tests/acceptance/cli_test.py

@@ -984,6 +984,37 @@ def test_run_without_command(self):
             [u'/bin/true'],
         )
 
+    def test_run_rm(self):
+        volumes = self.client.volumes()['Volumes']
+        if volumes is None:
+            volumesBefore = 0
+        else:
+            volumesBefore = len(volumes)
+
+        self.base_dir = 'tests/fixtures/volume'
+        self.dispatch(['run', '--rm', 'test', '/bin/true'])
+        service = self.project.get_service('test')
+        self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 0)
+
+        volumes = self.client.volumes()['Volumes']
+        if volumes is None:
+            volumesAfter = 0
+        else:
+            volumesAfter = len(volumes)
+
+        self.assertEqual(volumesAfter - volumesBefore, 0)
+
+    def test_run_rm_keeps_named_volume(self):
+        self.base_dir = 'tests/fixtures/volume-named'
+        self.dispatch(['run', '--rm', 'test', '/bin/true'])
+        service = self.project.get_service('test')
+        self.assertEqual(len(service.containers(stopped=True, one_off=OneOffFilter.only)), 0)
+        volumes = self.client.volumes()['Volumes']
+        assert volumes is not None
+        name = service.options.get('volumes')[0].external
+        volumeNames = [v['Name'] for v in volumes]
+        assert name in volumeNames
+
     def test_run_service_with_dockerfile_entrypoint(self):
         self.base_dir = 'tests/fixtures/entrypoint-dockerfile'
         self.dispatch(['run', 'test'])

tests/fixtures/volume-named/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '2'
+services:
+  test:
+    image: busybox
+    command: top
+    volumes:
+      - testvolume:/container-path
+
+volumes:
+  testvolume: {}

tests/fixtures/volume/docker-compose.yml

@@ -0,0 +1,5 @@
+test:
+  image: busybox
+  command: top
+  volumes:
+    - /container-path