diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-13 18:12:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-13 18:12:25 +0200 |
commit | 7875e00c663a42dd26c99889206cdb8f16ff0905 (patch) | |
tree | 7ce115ad37c16634a8c4d42e0d0c89ae3002b3bf /libpod/container_api.go | |
parent | 5c09c4d2947a759724f9d5aef6bac04317e03f7e (diff) | |
parent | 82ac0d8925dbb5aa738f1494ecb002eb6daca992 (diff) | |
download | podman-7875e00c663a42dd26c99889206cdb8f16ff0905.tar.gz podman-7875e00c663a42dd26c99889206cdb8f16ff0905.tar.bz2 podman-7875e00c663a42dd26c99889206cdb8f16ff0905.zip |
Merge pull request #3934 from rhatdan/wait
Podman-remote run should wait for exit code
Diffstat (limited to 'libpod/container_api.go')
-rw-r--r-- | libpod/container_api.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 9bf97c5d4..4f0d5301c 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -216,8 +216,8 @@ func (c *Container) Kill(signal uint) error { } // Exec starts a new process inside the container -// Returns an exit code and an error. If Exec was not able to exec in the container before a failure, an exit code of 126 is returned. -// If another generic error happens, an exit code of 125 is returned. +// Returns an exit code and an error. If Exec was not able to exec in the container before a failure, an exit code of define.ExecErrorCodeCannotInvoke is returned. +// If another generic error happens, an exit code of define.ExecErrorCodeGeneric is returned. // Sometimes, the $RUNTIME exec call errors, and if that is the case, the exit code is the exit code of the call. // Otherwise, the exit code will be the exit code of the executed call inside of the container. // TODO investigate allowing exec without attaching @@ -821,3 +821,12 @@ func (c *Container) Restore(ctx context.Context, options ContainerCheckpointOpti defer c.newContainerEvent(events.Restore) return c.restore(ctx, options) } + +// AutoRemove indicates whether the container will be removed after it is executed +func (c *Container) AutoRemove() bool { + spec := c.config.Spec + if spec.Annotations == nil { + return false + } + return c.Spec().Annotations[InspectAnnotationAutoremove] == InspectResponseTrue +} |