diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-09-07 05:47:05 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-09-12 16:20:01 -0400 |
| commit | 82ac0d8925dbb5aa738f1494ecb002eb6daca992 (patch) | |
| tree | fcb1d2961f223806b228e7c930bc134fc9f0f7fd /pkg/adapter/containers.go | |
| parent | 535111b5d5cfa0d203df77e6d6b0b69eda46bb82 (diff) | |
| download | podman-82ac0d8925dbb5aa738f1494ecb002eb6daca992.tar.gz podman-82ac0d8925dbb5aa738f1494ecb002eb6daca992.tar.bz2 podman-82ac0d8925dbb5aa738f1494ecb002eb6daca992.zip | |
Podman-remote run should wait for exit code
This change matches what is happening on the podman local side
and should eliminate a race condition.
Also exit commands on the server side should start to return to client.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/adapter/containers.go')
| -rw-r--r-- | pkg/adapter/containers.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go index 2ce437828..47db5c0dc 100644 --- a/pkg/adapter/containers.go +++ b/pkg/adapter/containers.go @@ -396,14 +396,7 @@ func (r *LocalRuntime) Run(ctx context.Context, c *cliconfig.RunValues, exitCode // Do not perform cleanup, or wait for container exit code // Just exit immediately if errors.Cause(err) == define.ErrDetach { - exitCode = 0 - return exitCode, nil - } - // This means the command did not exist - exitCode = 127 - e := strings.ToLower(err.Error()) - if strings.Contains(e, "permission denied") || strings.Contains(e, "operation not permitted") { - exitCode = 126 + return 0, nil } if c.IsSet("rm") { if deleteError := r.Runtime.RemoveContainer(ctx, ctr, true, false); deleteError != nil { |