diff --git a/fig/cli/main.py b/fig/cli/main.py index eee5563f5..dfd02d0bb 100644 --- a/fig/cli/main.py +++ b/fig/cli/main.py @@ -170,6 +170,9 @@ class TopLevelCommand(Command): Remove stopped service containers. Usage: rm [SERVICE...] + + Options: + -v Remove volumes associated with containers """ all_containers = self.project.containers(service_names=options['SERVICE'], stopped=True) stopped_containers = [c for c in all_containers if not c.is_running] @@ -177,7 +180,8 @@ class TopLevelCommand(Command): if len(stopped_containers) > 0: print("Going to remove", list_containers(stopped_containers)) if yesno("Are you sure? [yN] ", default=False): - self.project.remove_stopped(service_names=options['SERVICE']) + self.project.remove_stopped(service_names=options['SERVICE'], + remove_volumes=options['-v']) else: print("No stopped containers") diff --git a/fig/container.py b/fig/container.py index c9417d0f6..a38828d0b 100644 --- a/fig/container.py +++ b/fig/container.py @@ -111,8 +111,9 @@ class Container(object): def kill(self): return self.client.kill(self.id) - def remove(self): - return self.client.remove_container(self.id) + def remove(self, **options): + v = options.get('remove_volumes', False) + return self.client.remove_container(self.id, v=v) def inspect_if_not_inspected(self): if not self.has_been_inspected: