p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #16144 from albers/fix-volume-optional

Browse Source 
[Fix 16122] usage for `docker volume inspect` and `docker volume rm`
Upstream-commit: 2b6da0a965f3f36e88e055266da41c82897188e6
Component: engine
This commit is contained in:
Jess Frazelle
2015-09-08 11:18:43 -07:00
parent 83b7660b8b c50d0a0555
commit acf61856ce
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/api/client/volume.go
View File

@ -102,7 +102,7 @@ func (cli *DockerCli) CmdVolumeLs(args ...string) error {
//
// Usage: docker volume inspect [OPTIONS] VOLUME [VOLUME...]
func (cli *DockerCli) CmdVolumeInspect(args ...string) error {
cmd := Cli.Subcmd("volume inspect", []string{"[VOLUME NAME]"}, "Return low-level information on a volume", true)
cmd := Cli.Subcmd("volume inspect", []string{"VOLUME [VOLUME...]"}, "Return low-level information on a volume", true)
tmplStr := cmd.String([]string{"f", "-format"}, "", "Format the output using the given go template.")
if err := cmd.Parse(args); err != nil {
return nil
@ -210,7 +210,7 @@ func (cli *DockerCli) CmdVolumeCreate(args ...string) error {
//
// Usage: docker volume rm VOLUME [VOLUME...]
func (cli *DockerCli) CmdVolumeRm(args ...string) error {
cmd := Cli.Subcmd("volume rm", []string{"[NAME]"}, "Remove a volume", true)
cmd := Cli.Subcmd("volume rm", []string{"VOLUME [VOLUME...]"}, "Remove a volume", true)
cmd.Require(flag.Min, 1)
cmd.ParseFlags(args, true)

4
components/engine/docs/reference/commandline/volume_inspect.md
View File

@ -10,9 +10,9 @@ parent = "smn_cli"
# volume inspect
Usage: docker volume inspect [OPTIONS] [VOLUME NAME]
Usage: docker volume inspect [OPTIONS] VOLUME [VOLUME...]
Inspect a volume
Inspect one or more volumes
-f, --format= Format the output using the given go template.

4
components/engine/docs/reference/commandline/volume_rm.md
View File

@ -10,13 +10,13 @@ parent = "smn_cli"
# volume rm
Usage: docker volume rm [OPTIONS] [VOLUME NAME]
Usage: docker volume rm [OPTIONS] VOLUME [VOLUME...]
Remove a volume
--help=false Print usage
Removes a volume. You cannot remove a volume that is in use by a container.
Removes one or more volumes. You cannot remove a volume that is in use by a container.
$ docker volume rm hello
hello

4
components/engine/man/docker-volume-inspect.1.md
View File

@ -8,11 +8,11 @@ docker-volume-inspect - Get low-level information about a volume
**docker volume inspect**
[**-f**|**--format**[=**]]
[OPTIONS] [VOLUME NAME]
[OPTIONS] VOLUME [VOLUME...]
# DESCRIPTION
Returns information about a volume. By default, this command renders all results
Returns information about one or more volumes. By default, this command renders all results
in a JSON array. You can specify an alternate format to execute a given template
is executed for each result. Go's
http://golang.org/pkg/text/template/ package describes all the details of the

4
components/engine/man/docker-volume-rm.1.md
View File

@ -7,11 +7,11 @@ docker-volume-rm - Remove a volume
# SYNOPSIS
**docker volume rm**
[OPTIONS] [VOLUME NAME]
[OPTIONS] VOLUME [VOLUME...]
# DESCRIPTION
Removes a volume. You cannot remove a volume that is in use by a container.
Removes one or more volumes. You cannot remove a volume that is in use by a container.
```
$ docker volume rm hello