summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-13 14:29:17 -0700
committerGitHub <noreply@github.com>2019-03-13 14:29:17 -0700
commit7426d4fbbeaf5ebd3d55576add89b99cd3f3f760 (patch)
treeaa289963f15ea4374c7521418e217c9178d30564 /cmd/podman
parent22fc5a3e57566326b96f465e69e5566598666841 (diff)
parent17b60891b6a4ce4e5c0e8ddae1a2dd9490a0e0d8 (diff)
downloadpodman-7426d4fbbeaf5ebd3d55576add89b99cd3f3f760.tar.gz
podman-7426d4fbbeaf5ebd3d55576add89b99cd3f3f760.tar.bz2
podman-7426d4fbbeaf5ebd3d55576add89b99cd3f3f760.zip
Merge pull request #2631 from giuseppe/fix-race-rm
rm: fix cleanup race
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/run.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 130c5a32c..a92d5d3db 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -166,6 +166,10 @@ func runCmd(c *cliconfig.RunValues) error {
exitCode = int(ecode)
}
+ if c.IsSet("rm") {
+ runtime.RemoveContainer(ctx, ctr, false, true)
+ }
+
return nil
}