From 182048f18592259633d21ac55bd5b73903de50b9 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 19 Jan 2017 08:33:05 -0800 Subject: [PATCH 1/2] Add bash completion for `run|create --init-path` Signed-off-by: Harald Albers --- contrib/completion/bash/docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index d72f4e00d4..43ec69ac37 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1335,6 +1335,7 @@ _docker_container_run() { --expose --group-add --hostname -h + --init-path --ip --ip6 --ipc @@ -1447,7 +1448,7 @@ _docker_container_run() { __docker_complete_capabilities return ;; - --cidfile|--env-file|--label-file) + --cidfile|--env-file|--init-path|--label-file) _filedir return ;; From d049ef2b0db4aebfba4f85f5d8294e9884a4b7e2 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 19 Jan 2017 08:47:01 -0800 Subject: [PATCH 2/2] Add docs for `run|create --init|--init-path` Signed-off-by: Harald Albers --- docs/reference/commandline/create.md | 2 ++ docs/reference/commandline/run.md | 2 ++ man/docker-run.1.md | 10 +++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/reference/commandline/create.md b/docs/reference/commandline/create.md index 439e75fac9..253c72da70 100644 --- a/docs/reference/commandline/create.md +++ b/docs/reference/commandline/create.md @@ -63,6 +63,8 @@ Options: --health-timeout duration Maximum time to allow one check to run (ns|us|ms|s|m|h) (default 0s) --help Print usage -h, --hostname string Container host name + --init Run an init inside the container that forwards signals and reaps processes + --init-path string Path to the docker-init binary -i, --interactive Keep STDIN open even if not attached --io-maxbandwidth string Maximum IO bandwidth limit for the system drive (Windows only) --io-maxiops uint Maximum IOps limit for the system drive (Windows only) diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index d1f12a90ee..9bacea4b1f 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -67,6 +67,8 @@ Options: --health-timeout duration Maximum time to allow one check to run (ns|us|ms|s|m|h) (default 0s) --help Print usage -h, --hostname string Container host name + --init Run an init inside the container that forwards signals and reaps processes + --init-path string Path to the docker-init binary -i, --interactive Keep STDIN open even if not attached --io-maxbandwidth string Maximum IO bandwidth limit for the system drive (Windows only) (Windows only). The format is ``. diff --git a/man/docker-run.1.md b/man/docker-run.1.md index fe671e54aa..4e03331521 100644 --- a/man/docker-run.1.md +++ b/man/docker-run.1.md @@ -41,6 +41,8 @@ docker-run - Run a command in a new container [**--group-add**[=*[]*]] [**-h**|**--hostname**[=*HOSTNAME*]] [**--help**] +[**--init**] +[**--init-path**[=*[]*]] [**-i**|**--interactive**] [**--ip**[=*IPv4-ADDRESS*]] [**--ip6**[=*IPv6-ADDRESS*]] @@ -309,7 +311,13 @@ redirection on the host system. Sets the container host name that is available inside the container. **--help** - Print usage statement + Print usage statement + +**--init** + Run an init inside the container that forwards signals and reaps processes + +**--init-path**="" + Path to the docker-init binary **-i**, **--interactive**=*true*|*false* Keep STDIN open even if not attached. The default is *false*.