From 1d540a50d0bf70ba4a7da81b5be55d8d16c59b81 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 25 Jan 2020 13:54:23 +0100 Subject: [PATCH] Update flag description for docker rm -v The `-v` option removes anonymous volume only, and keeps named volumes. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 8f5379b30182e2e8aa067165e292e4b2fdb5bdf0) Signed-off-by: Sebastiaan van Stijn --- cli/command/container/rm.go | 2 +- contrib/completion/fish/docker.fish | 2 +- docs/reference/commandline/rm.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/command/container/rm.go b/cli/command/container/rm.go index 2dcd4b6ace..54ce2ad1a8 100644 --- a/cli/command/container/rm.go +++ b/cli/command/container/rm.go @@ -35,7 +35,7 @@ func NewRmCommand(dockerCli command.Cli) *cobra.Command { } flags := cmd.Flags() - flags.BoolVarP(&opts.rmVolumes, "volumes", "v", false, "Remove the volumes associated with the container") + flags.BoolVarP(&opts.rmVolumes, "volumes", "v", false, "Remove anonymous volumes associated with the container") flags.BoolVarP(&opts.rmLink, "link", "l", false, "Remove the specified link") flags.BoolVarP(&opts.force, "force", "f", false, "Force the removal of a running container (uses SIGKILL)") return cmd diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index b62582e245..30959e12c1 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -439,7 +439,7 @@ complete -c docker -f -n '__fish_docker_no_subcommand' -a rm -d 'Remove one or m complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s f -l force -d 'Force the removal of a running container (uses SIGKILL)' complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s l -l link -d 'Remove the specified link and not the underlying container' -complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s v -l volumes -d 'Remove the volumes associated with the container' +complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s v -l volumes -d 'Remove anonymous volumes associated with the container' complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -a '(__fish_print_docker_containers stopped)' -d "Container" complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s f -l force -a '(__fish_print_docker_containers all)' -d "Container" diff --git a/docs/reference/commandline/rm.md b/docs/reference/commandline/rm.md index 402cb93aa7..18363a5751 100644 --- a/docs/reference/commandline/rm.md +++ b/docs/reference/commandline/rm.md @@ -24,7 +24,7 @@ Options: -f, --force Force the removal of a running container (uses SIGKILL) --help Print usage -l, --link Remove the specified link - -v, --volumes Remove the volumes associated with the container + -v, --volumes Remove anonymous volumes associated with the container ``` ## Examples