containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3072 from mheon/no_rm_volume 

Do not remove volumes when --rm removes a container
This commit is contained in:
OpenShift Merge Robot 2019-05-08 23:03:55 +02:00 committed by GitHub
parent 49e09ddbf5 5c6ff901ba
commit 627dbd49c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,7 +592,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

@ -614,7 +614,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