Do not remove volumes when --rm removes a container

This duplicates Docker behavior for the `--rm` flag. Fixes containers#3071 Signed-off-by: Matthew Heon <[email protected]>
mheon · May 6, 2019 · 5c6ff90 · 5c6ff90
1 parent a9fc570
commit 5c6ff90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
@@ -585,7 +585,7 @@ Automatically remove the container when it exits. The default is *false*.
 
 Note that the container will not be removed when it could not be created or
 started successfully. This allows the user to inspect the container after
-failure. The `--rm` flag is incompatible with the `-d` flag.
+failure.
 
 **--rootfs**
 

diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
@@ -607,7 +607,7 @@ Automatically remove the container when it exits. The default is *false*.
 
 Note that the container will not be removed when it could not be created or
 started successfully. This allows the user to inspect the container after
-failure. The `--rm` flag is incompatible with the `-d` flag.
+failure.
 
 **--rootfs**
 

diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
@@ -413,7 +413,9 @@ func (r *LocalRuntime) Run(ctx context.Context, c *cliconfig.RunValues, exitCode
 	}
 
 	if c.IsSet("rm") {
-		r.Runtime.RemoveContainer(ctx, ctr, false, true)
+		if err := r.Runtime.RemoveContainer(ctx, ctr, false, false); err != nil {
+			logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)
+		}
 	}
 
 	return exitCode, nil
@@ -965,8 +967,9 @@ func (r *LocalRuntime) CleanupContainers(ctx context.Context, cli *cliconfig.Cle
 	return ok, failures, nil
 }
 
+// Only used when cleaning up containers
 func removeContainer(ctx context.Context, ctr *libpod.Container, runtime *LocalRuntime) error {
-	if err := runtime.RemoveContainer(ctx, ctr, false, true); err != nil {
+	if err := runtime.RemoveContainer(ctx, ctr, false, false); err != nil {
 		return errors.Wrapf(err, "failed to cleanup and remove container %v", ctr.ID())
 	}
 	return nil