diff --git a/docs/sources/api/docker_remote_api.rst b/docs/sources/api/docker_remote_api.rst index c6e50a3f06..f002ac40bc 100644 --- a/docs/sources/api/docker_remote_api.rst +++ b/docs/sources/api/docker_remote_api.rst @@ -29,6 +29,11 @@ You can still call an old version of the api using /v1.0/images//insert What's new ---------- +Listing processes (/proc): + +- List the processes inside a container + + Builder (/build): - Simplify the upload of the build context diff --git a/docs/sources/api/docker_remote_api_v1.3.rst b/docs/sources/api/docker_remote_api_v1.3.rst index 8eeb010d98..6f7025c449 100644 --- a/docs/sources/api/docker_remote_api_v1.3.rst +++ b/docs/sources/api/docker_remote_api_v1.3.rst @@ -220,6 +220,46 @@ Inspect a container :statuscode 500: server error +List processes running inside a container +***************************************** + +.. http:get:: /containers/(id)/proc + + List processes running inside the container ``id`` + + **Example request**: + + .. sourcecode:: http + + GET /containers/4fa6e0f0c678/proc HTTP/1.1 + + **Example response**: + + .. sourcecode:: http + + HTTP/1.1 200 OK + Content-Type: application/json + + [ + { + "PID":"11935", + "Tty":"pts/2", + "Time":"00:00:00", + "Cmd":"sh" + }, + { + "PID":"12140", + "Tty":"pts/2", + "Time":"00:00:00", + "Cmd":"sleep" + } + ] + + :statuscode 200: no error + :statuscode 404: no such container + :statuscode 500: server error + + Inspect changes on a container's filesystem ******************************************* diff --git a/docs/sources/commandline/cli.rst b/docs/sources/commandline/cli.rst index 118f42f6e8..357423fb93 100644 --- a/docs/sources/commandline/cli.rst +++ b/docs/sources/commandline/cli.rst @@ -41,6 +41,7 @@ Available Commands command/login command/logs command/port + command/proc command/ps command/pull command/push diff --git a/docs/sources/commandline/command/proc.rst b/docs/sources/commandline/command/proc.rst new file mode 100644 index 0000000000..b7e9a96ae1 --- /dev/null +++ b/docs/sources/commandline/command/proc.rst @@ -0,0 +1,13 @@ +:title: Proc Command +:description: Lookup the running processes of a container +:keywords: proc, docker, container, documentation + +======================================================= +``proc`` -- Lookup the running processes of a container +======================================================= + +:: + + Usage: docker proc CONTAINER + + Lookup the running processes of a container