mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
6c5c34d50d
This fix tries to address the issue in raised #23367 where an out-of-band volume driver deletion leaves some data in docker. This prevent the reuse of deleted volume names (by out-of-band volume driver like flocker). This fix adds a `--force` field in `docker volume rm` to forcefully purge the data of the volume that has already been deleted. Related documentations have been updated. This fix is tested manually with flocker, as is specified in #23367. An integration test has also been added for the scenario described. This fix fixes #23367. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
68 lines
1.4 KiB
Go
68 lines
1.4 KiB
Go
package volume
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/docker/docker/api/client"
|
|
"github.com/docker/docker/cli"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type removeOptions struct {
|
|
force bool
|
|
|
|
volumes []string
|
|
}
|
|
|
|
func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
|
|
var opts removeOptions
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "rm [OPTIONS] VOLUME [VOLUME]...",
|
|
Aliases: []string{"remove"},
|
|
Short: "Remove one or more volumes",
|
|
Long: removeDescription,
|
|
Example: removeExample,
|
|
Args: cli.RequiresMinArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.volumes = args
|
|
return runRemove(dockerCli, &opts)
|
|
},
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
flags.BoolVarP(&opts.force, "force", "f", false, "Force the removal of one or more volumes")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runRemove(dockerCli *client.DockerCli, opts *removeOptions) error {
|
|
client := dockerCli.Client()
|
|
ctx := context.Background()
|
|
status := 0
|
|
|
|
for _, name := range opts.volumes {
|
|
if err := client.VolumeRemove(ctx, name, opts.force); err != nil {
|
|
fmt.Fprintf(dockerCli.Err(), "%s\n", err)
|
|
status = 1
|
|
continue
|
|
}
|
|
fmt.Fprintf(dockerCli.Out(), "%s\n", name)
|
|
}
|
|
|
|
if status != 0 {
|
|
return cli.StatusError{StatusCode: status}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
var removeDescription = `
|
|
Remove one or more volumes. You cannot remove a volume that is in use by a container.
|
|
`
|
|
|
|
var removeExample = `
|
|
$ docker volume rm hello
|
|
hello
|
|
`
|