From fe36f50059f51a258f8bb563b6abb810187be53b Mon Sep 17 00:00:00 2001
From: allencloud <allen.sun@daocloud.io>
Date: Sat, 4 Feb 2017 14:28:14 +0800
Subject: [PATCH] add expose and publish filter in swagger.yml and CLI docs for
 docker/master

Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 44bd658913647ddadc3c225233c08ee61ef3c5ed
Component: engine
---
 components/engine/api/swagger.yaml                 | 2 ++
 components/engine/docs/reference/commandline/ps.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml
index 456cc4f1fe..d60506446b 100644
--- a/components/engine/api/swagger.yaml
+++ b/components/engine/api/swagger.yaml
@@ -2488,6 +2488,7 @@ paths:
 
             - `ancestor`=(`<image-name>[:<tag>]`, `<image id>`, or `<image@digest>`)
             - `before`=(`<container id>` or `<container name>`)
+            - `expose`=(`<port>[/<proto>]`|`<startport-endport>/[<proto>]`)
             - `exited=<int>` containers with exit code of `<int>`
             - `health`=(`starting`|`healthy`|`unhealthy`|`none`)
             - `id=<ID>` a container's ID
@@ -2496,6 +2497,7 @@ paths:
             - `label=key` or `label="key=value"` of a container label
             - `name=<name>` a container's name
             - `network`=(`<network id>` or `<network name>`)
+            - `publish`=(`<port>[/<proto>]`|`<startport-endport>/[<proto>]`)
             - `since`=(`<container id>` or `<container name>`)
             - `status=`(`created`|`restarting`|`running`|`removing`|`paused`|`exited`|`dead`)
             - `volume`=(`<volume name>` or `<mount point destination>`)
diff --git a/components/engine/docs/reference/commandline/ps.md b/components/engine/docs/reference/commandline/ps.md
index b8c7356cf5..ce234f6d7b 100644
--- a/components/engine/docs/reference/commandline/ps.md
+++ b/components/engine/docs/reference/commandline/ps.md
@@ -26,6 +26,7 @@ Options:
                         - ancestor=(<image-name>[:tag]|<image-id>|<image@digest>)
                           containers created from an image or a descendant.
                         - before=(<container-name>|<container-id>)
+                        - expose=(<port>[/<proto>]|<startport-endport>/[<proto>])
                         - exited=<int> an exit code of <int>
                         - health=(starting|healthy|unhealthy|none)
                         - id=<ID> a container's ID
@@ -34,6 +35,7 @@ Options:
                         - label=<key> or label=<key>=<value>
                         - name=<string> a container's name
                         - network=(<network-id>|<network-name>)
+                        - publish=(<port>[/<proto>]|<startport-endport>/[<proto>])
                         - since=(<container-name>|<container-id>)
                         - status=(created|restarting|removing|running|paused|exited) 
                         - volume=(<volume name>|<mount point destination>)