From d96eb47dee10a059436b4d4cf285db1d70468e26 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 3 Jun 2014 17:10:59 -0400 Subject: [PATCH 1/2] Added note in manpages to clarify effect of docker start on started container When run on a container that is already running, docker always succeeds. This was an intentional change in v0.10; it previously caused an error. This commit clarifies the man pages to indicate this is intended behavior. Docker-DCO-1.1-Signed-off-by: Matthew Heon (github: mheon) --- contrib/man/md/docker-start.1.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/man/md/docker-start.1.md b/contrib/man/md/docker-start.1.md index 9e639bbb5e..2815f1b07f 100644 --- a/contrib/man/md/docker-start.1.md +++ b/contrib/man/md/docker-start.1.md @@ -20,6 +20,10 @@ the process **-i**, **--interactive**=*true*|*false* When true attach to container's stdin +# NOTES +If run on a started container, start takes no action and succeeds +unconditionally. + # HISTORY April 2014, Originally compiled by William Henry (whenry at redhat dot com) based on docker.io source material and internal work. From d08c965e2c6ed223e10773ac77f95b7b6e273e0a Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 5 Jun 2014 15:08:54 -0400 Subject: [PATCH 2/2] Clarify effect of docker start on started container in CLI docs This behavior changed from v0.9 to v0.10, so document it to prevent any confusion. Docker-DCO-1.1-Signed-off-by: Matthew Heon (github: mheon) --- docs/sources/reference/commandline/cli.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index 829f13b9a6..3e61c94adc 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -1139,6 +1139,9 @@ more details on finding shared images from the commandline. -a, --attach=false Attach container's stdout/stderr and forward all signals to the process -i, --interactive=false Attach container's stdin +When run on a container that has already been started, +takes no action and succeeds unconditionally. + ## stop Usage: docker stop [OPTIONS] CONTAINER [CONTAINER...]