diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-14 21:45:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 21:45:58 +0100 |
| commit | 8ec9eb0a7617b6c2db6ed092ab741552dc7cba02 (patch) | |
| tree | 2d1212425257a8d332f4400d0896aa2e465176b0 /pkg/varlinkapi/containers.go | |
| parent | dd82acd8ba02be51ec5fea65584e1f7b2036d7c8 (diff) | |
| parent | 52df1fa7e054d577e8416d1d46db1741ad324d4a (diff) | |
| download | podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.tar.gz podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.tar.bz2 podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.zip | |
Merge pull request #2229 from rhatdan/volumes
Fix volume handling in podman
Diffstat (limited to 'pkg/varlinkapi/containers.go')
| -rw-r--r-- | pkg/varlinkapi/containers.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index 2b2832838..8a52efa61 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -358,13 +358,13 @@ func (i *LibpodAPI) WaitContainer(call iopodman.VarlinkCall, name string) error } // RemoveContainer ... -func (i *LibpodAPI) RemoveContainer(call iopodman.VarlinkCall, name string, force bool) error { +func (i *LibpodAPI) RemoveContainer(call iopodman.VarlinkCall, name string, force bool, removeVolumes bool) error { ctx := getContext() ctr, err := i.Runtime.LookupContainer(name) if err != nil { return call.ReplyContainerNotFound(name) } - if err := i.Runtime.RemoveContainer(ctx, ctr, force); err != nil { + if err := i.Runtime.RemoveContainer(ctx, ctr, force, removeVolumes); err != nil { return call.ReplyErrorOccurred(err.Error()) } return call.ReplyRemoveContainer(ctr.ID()) @@ -385,7 +385,7 @@ func (i *LibpodAPI) DeleteStoppedContainers(call iopodman.VarlinkCall) error { return call.ReplyErrorOccurred(err.Error()) } if state != libpod.ContainerStateRunning { - if err := i.Runtime.RemoveContainer(ctx, ctr, false); err != nil { + if err := i.Runtime.RemoveContainer(ctx, ctr, false, false); err != nil { return call.ReplyErrorOccurred(err.Error()) } deletedContainers = append(deletedContainers, ctr.ID()) |