Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improvement for docker subcommand's help messages 

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
This commit is contained in:
Wen Cheng Ma 2015-12-03 15:16:53 +08:00 committed by Tibor Vass
parent 9a63a5cdd6
commit 636ffcc028
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/reference/commandline/ps.md
View File

@ -15,7 +15,15 @@ parent = "smn_cli"
List containers List containers
-a, --all Show all containers (default shows just running) -a, --all Show all containers (default shows just running)
-f, --filter=[] Filter output based on conditions provided -f, --filter=[] Filter output based on these conditions:
- exited=<int> an exit code of <int>
- label=<key> or label=<key>=<value>
- status=(created|restarting|running|paused|exited)
- name=<string> a container's name
- id=<ID> a container's ID
- before=(<container-name>|<container-id>)
- since=(<container-name>|<container-id>)
- ancestor=(<image-name>[:tag]|<image-id>|<image@digest>) - containers created from an image or a descendant.
--format=[] Pretty-print containers using a Go template --format=[] Pretty-print containers using a Go template
--help Print usage --help Print usage
-l, --latest Show the latest created container (includes all states) -l, --latest Show the latest created container (includes all states)

19
man/docker-ps.1.md
View File

@ -26,16 +26,15 @@ the running containers.
Show all containers. Only running containers are shown by default. The default is *false*. Show all containers. Only running containers are shown by default. The default is *false*.
**-f**, **--filter**=[] **-f**, **--filter**=[]
Provide filter values. Valid filters: Filter output based on these conditions:
exited=<int> - containers with exit code of <int> - exited=<int> an exit code of <int>
label=<key> or label=<key>=<value> - label=<key> or label=<key>=<value>
status=(created|restarting|running|paused|exited) - status=(created|restarting|running|paused|exited)
name=<string> - container's name - name=<string> a container's name
id=<ID> - container's ID - id=<ID> a container's ID
before=(<container-name>|<container-id>) - before=(<container-name>|<container-id>)
since=(<container-name>|<container-id>) - since=(<container-name>|<container-id>)
ancestor=(<image-name>[:tag]|<image-id>|<image@digest>) - filters containers that were - ancestor=(<image-name>[:tag]|<image-id>|<image@digest>) - containers created from an image or a descendant.
created from the given image or a descendant.
**--format**="*TEMPLATE*" **--format**="*TEMPLATE*"
Pretty-print containers using a Go template. Pretty-print containers using a Go template.