diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-24 13:16:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 13:16:21 +0200 |
| commit | eae9a009b2038d78a2cc92db740c99b1b8dc0101 (patch) | |
| tree | 0bcbb02a1110495b7fb46eb4c8f3776a0849efaf /pkg/adapter/containers.go | |
| parent | 0d441f57d64bcca16c14ca44b7c8f35ab687ea3f (diff) | |
| parent | 01a8483a59eed8bc706b5219b903704544b66c10 (diff) | |
| download | podman-eae9a009b2038d78a2cc92db740c99b1b8dc0101.tar.gz podman-eae9a009b2038d78a2cc92db740c99b1b8dc0101.tar.bz2 podman-eae9a009b2038d78a2cc92db740c99b1b8dc0101.zip | |
Merge pull request #3624 from haircommander/conmon-exec-with-remote-exec
Add remote exec
Diffstat (limited to 'pkg/adapter/containers.go')
| -rw-r--r-- | pkg/adapter/containers.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go index 47f1b091e..faaef3e60 100644 --- a/pkg/adapter/containers.go +++ b/pkg/adapter/containers.go @@ -1000,7 +1000,8 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal streams.AttachOutput = true streams.AttachError = true - return ExecAttachCtr(ctx, ctr.Container, cli.Tty, cli.Privileged, envs, cmd, cli.User, cli.Workdir, streams, cli.PreserveFDs, cli.DetachKeys) + ec, err = ExecAttachCtr(ctx, ctr.Container, cli.Tty, cli.Privileged, envs, cmd, cli.User, cli.Workdir, streams, cli.PreserveFDs, cli.DetachKeys) + return define.TranslateExecErrorToExitCode(ec, err), err } // Prune removes stopped containers |