summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-06-15 06:24:42 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-08-01 03:40:29 -0400
commit5370d9cb76a8075332f5ab6a0efef9fba28ba19b (patch)
tree5f537b4a2a70c140aeb6533657c301fc5e9e2b7e /pkg
parenta622f8d345b1853401de2e533e9fbf14ef169fa2 (diff)
downloadpodman-5370d9cb76a8075332f5ab6a0efef9fba28ba19b.tar.gz
podman-5370d9cb76a8075332f5ab6a0efef9fba28ba19b.tar.bz2
podman-5370d9cb76a8075332f5ab6a0efef9fba28ba19b.zip
Add new exit codes to rm & rmi for running containers & dependencies
This enables programs and scripts wrapping the podman command to handle 'podman rm' and 'podman rmi' failures caused by paused or running containers or due to images having other child images or dependent containers. These errors are common enough that it makes sense to have a more machine readable way of detecting them than parsing the standard error output. Signed-off-by: Ondrej Zoder <ozoder@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/varlinkapi/containers.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index cd5f305c9..bb66ff962 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -488,6 +488,12 @@ func (i *LibpodAPI) RemoveContainer(call iopodman.VarlinkCall, name string, forc
return call.ReplyContainerNotFound(name, err.Error())
}
if err := i.Runtime.RemoveContainer(ctx, ctr, force, removeVolumes); err != nil {
+ if errors.Cause(err) == define.ErrNoSuchCtr {
+ return call.ReplyContainerExists(1)
+ }
+ if errors.Cause(err) == define.ErrCtrStateInvalid {
+ return call.ReplyInvalidState(ctr.ID(), err.Error())
+ }
return call.ReplyErrorOccurred(err.Error())
}
return call.ReplyRemoveContainer(ctr.ID())