diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 803ab7592..16ac1c645 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -46,6 +46,7 @@ Leno Hou letty letty letty.ll +Lifubang luman.qy Mark Liu MarkLux diff --git a/docs/api/HTTP_API.md b/docs/api/HTTP_API.md index 0b85090a8..9ab69a9d6 100644 --- a/docs/api/HTTP_API.md +++ b/docs/api/HTTP_API.md @@ -749,7 +749,7 @@ POST /containers/{id}/stop ### Display the running processes of a container ``` -POST /containers/{id}/top +GET /containers/{id}/top ``` @@ -2449,6 +2449,7 @@ is a small subset of the Config struct that holds the configuration. |**Cmd**
*optional*|Execution commands and args|< string > array| |**Detach**
*optional*|Execute in detach mode|boolean| |**DetachKeys**
*optional*|Escape keys for detach|string| +|**Env**
*optional*|envs for exec command in container|< string > array| |**Privileged**
*optional*|Is the container in privileged mode|boolean| |**Tty**
*optional*|Attach standard streams to a tty|boolean| |**User**
*optional*|User that will run the command|string| diff --git a/docs/commandline/pouch_exec.md b/docs/commandline/pouch_exec.md index 5541e89d2..88c6bcf06 100644 --- a/docs/commandline/pouch_exec.md +++ b/docs/commandline/pouch_exec.md @@ -23,11 +23,12 @@ PID USER TIME COMMAND ### Options ``` - -d, --detach Run the process in the background - -h, --help help for exec - -i, --interactive Open container's STDIN - -t, --tty Allocate a tty device - -u, --user string Username or UID (format: [:]) + -d, --detach Run the process in the background + -e, --env stringArray Set environment variables + -h, --help help for exec + -i, --interactive Open container's STDIN + -t, --tty Allocate a tty device + -u, --user string Username or UID (format: [:]) ``` ### Options inherited from parent commands