1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add missing filter type and sort filter type in alphabets

Browse Source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
allencloud 2017-02-03 16:34:45 +08:00 committed by Tibor Vass
parent ddadd3db49
commit 4113925b25
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/commandline/events.md
View File

@ -143,14 +143,14 @@ container container 588a23dac085 *AND* the event type is *start*
The currently supported filters are: The currently supported filters are:
* container (`container=<name or id>`) * container (`container=<name or id>`)
* daemon (`daemon=<name or id>`)
* event (`event=<event action>`) * event (`event=<event action>`)
* image (`image=<tag or id>`) * image (`image=<tag or id>`)
* plugin (experimental) (`plugin=<name or id>`)
* label (`label=<key>` or `label=<key>=<value>`) * label (`label=<key>` or `label=<key>=<value>`)
* network (`network=<name or id>`)
* plugin (`plugin=<name or id>`)
* type (`type=<container or image or volume or network or daemon>`) * type (`type=<container or image or volume or network or daemon>`)
* volume (`volume=<name or id>`) * volume (`volume=<name or id>`)
* network (`network=<name or id>`)
* daemon (`daemon=<name or id>`)
#### Format #### Format

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

@ -23,19 +23,20 @@ List containers
Options: Options:
-a, --all Show all containers (default shows just running) -a, --all Show all containers (default shows just running)
-f, --filter value Filter output based on conditions provided (default []) -f, --filter value Filter output based on conditions provided (default [])
- exited=<int> an exit code of <int>
- label=<key> or label=<key>=<value>
- status=(created|restarting|removing|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>) - ancestor=(<image-name>[:tag]|<image-id>|<image@digest>)
containers created from an image or a descendant. containers created from an image or a descendant.
- publish=(<port>[/<proto>]|<startport-endport>/[<proto>]) - before=(<container-name>|<container-id>)
- expose=(<port>[/<proto>]|<startport-endport>/[<proto>]) - exited=<int> an exit code of <int>
- is-task=(true|false)
- health=(starting|healthy|unhealthy|none) - health=(starting|healthy|unhealthy|none)
- id=<ID> a container's ID
- isolation=(`default`|`process`|`hyperv`) (Windows daemon only)
- is-task=(true|false)
- label=<key> or label=<key>=<value>
- name=<string> a container's name
- network=(<network-id>|<network-name>)
- since=(<container-name>|<container-id>)
- status=(created|restarting|removing|running|paused|exited)
- volume=(<volume name>|<mount point destination>)
--format string Pretty-print containers using a Go template --format string Pretty-print containers using a Go template
--help Print usage --help Print usage
-n, --last int Show n last created containers (includes all states) (default -1) -n, --last int Show n last created containers (includes all states) (default -1)