opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-02 17:22:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not remove volumes when --rm removes a container

Browse Source 
This duplicates Docker behavior for the `--rm` flag.

Fixes #3071

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2019-05-06 13:15:02 -04:00
parent a9fc570dd8
commit 5c6ff901ba
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/podman-create.1.md
View File

@ -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**

2
docs/podman-run.1.md
View File

@ -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**

7
pkg/adapter/containers.go
View File

@ -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