From 9786542620afea96d5eee2d05b7e1dec38a8235d Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 11 Dec 2018 16:10:35 -0600 Subject: failed containers with --rm should remove themselves when starting or running a container that has --rm, if the starting container fails (like due to an invalid command), the container should get removed. Resolves: #1985 Signed-off-by: baude --- cmd/podman/run.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cmd/podman/run.go') diff --git a/cmd/podman/run.go b/cmd/podman/run.go index a4b5c918e..20cb85347 100644 --- a/cmd/podman/run.go +++ b/cmd/podman/run.go @@ -116,6 +116,11 @@ func runCmd(c *cli.Context) error { if strings.Index(err.Error(), "permission denied") > -1 { exitCode = 126 } + if c.IsSet("rm") { + if deleteError := runtime.RemoveContainer(ctx, ctr, true); deleteError != nil { + logrus.Errorf("unable to remove container %s after failing to start and attach to it", ctr.ID()) + } + } return err } -- cgit v1.2.3-54-g00ecf