Merge pull request #6686 from SvenDowideit/commit-parens-update-6310

add missing docker commit parens (update 6310)
This commit is contained in:
Victor Vieux 2014-06-25 18:30:00 -07:00
commit 3051ffe0fa
2 changed files with 2 additions and 2 deletions

View File

@ -1520,7 +1520,7 @@ func (cli *DockerCli) CmdPs(args ...string) error {
func (cli *DockerCli) CmdCommit(args ...string) error { func (cli *DockerCli) CmdCommit(args ...string) error {
cmd := cli.Subcmd("commit", "[OPTIONS] CONTAINER [REPOSITORY[:TAG]]", "Create a new image from a container's changes") cmd := cli.Subcmd("commit", "[OPTIONS] CONTAINER [REPOSITORY[:TAG]]", "Create a new image from a container's changes")
flComment := cmd.String([]string{"m", "-message"}, "", "Commit message") flComment := cmd.String([]string{"m", "-message"}, "", "Commit message")
flAuthor := cmd.String([]string{"a", "#author", "-author"}, "", "Author (eg. \"John Hannibal Smith <hannibal@a-team.com>\"") flAuthor := cmd.String([]string{"a", "#author", "-author"}, "", "Author (eg. \"John Hannibal Smith <hannibal@a-team.com>\")")
// FIXME: --run is deprecated, it will be replaced with inline Dockerfile commands. // FIXME: --run is deprecated, it will be replaced with inline Dockerfile commands.
flConfig := cmd.String([]string{"#run", "#-run"}, "", "this option is deprecated and will be removed in a future version in favor of inline Dockerfile-compatible commands") flConfig := cmd.String([]string{"#run", "#-run"}, "", "this option is deprecated and will be removed in a future version in favor of inline Dockerfile-compatible commands")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {

View File

@ -306,7 +306,7 @@ schema.
Create a new image from a container's changes Create a new image from a container's changes
-a, --author="" Author (eg. "John Hannibal Smith <hannibal@a-team.com>" -a, --author="" Author (eg. "John Hannibal Smith <hannibal@a-team.com>")
-m, --message="" Commit message -m, --message="" Commit message
It can be useful to commit a container's file changes or settings into a It can be useful to commit a container's file changes or settings into a