From 1ebeb2c9b4ef22800845f2d97c277f35672f3ba9 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Mon, 18 Jan 2016 10:17:14 -0800 Subject: [PATCH] Print an info message when detaching a container started with --rm Closes #17516 Signed-off-by: Kenfe-Mickael Laventure --- api/client/run.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/api/client/run.go b/api/client/run.go index 16f4230e97..ca15bb6e4c 100644 --- a/api/client/run.go +++ b/api/client/run.go @@ -13,6 +13,7 @@ import ( "github.com/docker/docker/opts" "github.com/docker/docker/pkg/promise" "github.com/docker/docker/pkg/signal" + "github.com/docker/docker/pkg/stringid" runconfigopts "github.com/docker/docker/runconfig/opts" "github.com/docker/engine-api/types" "github.com/docker/libnetwork/resolvconf/dns" @@ -260,6 +261,16 @@ func (cli *DockerCli) CmdRun(args ...string) error { // Attached mode if *flAutoRemove { + // Warn user if they detached us + js, err := cli.client.ContainerInspect(createResponse.ID) + if err != nil { + return runStartContainerErr(err) + } + if js.State.Running == true || js.State.Paused == true { + fmt.Fprintf(cli.out, "Detached from %s, awaiting its termination in order to uphold \"--rm\".\n", + stringid.TruncateID(createResponse.ID)) + } + // Autoremove: wait for the container to finish, retrieve // the exit code and remove the container if status, err = cli.client.ContainerWait(createResponse.ID); err != nil {