Add --format to man and fix some typos

Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
This commit is contained in:
yuexiao-wang 2016-10-28 22:31:20 +08:00 committed by Tibor Vass
parent 7b22b129b9
commit baed1a070e
2 changed files with 10 additions and 9 deletions

View File

@ -134,8 +134,8 @@ The currently supported filters are:
* dangling (boolean - true or false) * dangling (boolean - true or false)
* label (`label=<key>` or `label=<key>=<value>`) * label (`label=<key>` or `label=<key>=<value>`)
* before (`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`) - filters images created before given id or references * before (`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`) - filter images created before given id or references
* since (`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`) - filters images created since given id or references * since (`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`) - filter images created since given id or references
##### Untagged images (dangling) ##### Untagged images (dangling)
@ -243,9 +243,9 @@ Placeholder | Description
`.Repository` | Image repository `.Repository` | Image repository
`.Tag` | Image tag `.Tag` | Image tag
`.Digest` | Image digest `.Digest` | Image digest
`.CreatedSince` | Elapsed time since the image was created. `.CreatedSince` | Elapsed time since the image was created
`.CreatedAt` | Time when the image was created. `.CreatedAt` | Time when the image was created
`.Size` | Image disk size. `.Size` | Image disk size
When using the `--format` option, the `image` command will either When using the `--format` option, the `image` command will either
output the data exactly as the template declares or, when using the output the data exactly as the template declares or, when using the

View File

@ -10,6 +10,7 @@ docker-images - List images
[**-a**|**--all**] [**-a**|**--all**]
[**--digests**] [**--digests**]
[**-f**|**--filter**[=*[]*]] [**-f**|**--filter**[=*[]*]]
[**--format**=*"TEMPLATE"*]
[**--no-trunc**] [**--no-trunc**]
[**-q**|**--quiet**] [**-q**|**--quiet**]
[REPOSITORY[:TAG]] [REPOSITORY[:TAG]]
@ -39,7 +40,7 @@ versions.
**-f**, **--filter**=[] **-f**, **--filter**=[]
Filters the output based on these conditions: Filters the output based on these conditions:
- dangling=(true|false) - finds unused images. - dangling=(true|false) - find unused images
- label=<key> or label=<key>=<value> - label=<key> or label=<key>=<value>
- before=(<image-name>[:tag]|<image-id>|<image@digest>) - before=(<image-name>[:tag]|<image-id>|<image@digest>)
- since=(<image-name>[:tag]|<image-id>|<image@digest>) - since=(<image-name>[:tag]|<image-id>|<image@digest>)
@ -51,9 +52,9 @@ versions.
.Repository - Image repository .Repository - Image repository
.Tag - Image tag .Tag - Image tag
.Digest - Image digest .Digest - Image digest
.CreatedSince - Elapsed time since the image was created. .CreatedSince - Elapsed time since the image was created
.CreatedAt - Time when the image was created.. .CreatedAt - Time when the image was created
.Size - Image disk size. .Size - Image disk size
**--help** **--help**
Print usage statement Print usage statement