summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-24 13:16:21 +0200
committerGitHub <noreply@github.com>2019-07-24 13:16:21 +0200
commiteae9a009b2038d78a2cc92db740c99b1b8dc0101 (patch)
tree0bcbb02a1110495b7fb46eb4c8f3776a0849efaf /cmd/podman
parent0d441f57d64bcca16c14ca44b7c8f35ab687ea3f (diff)
parent01a8483a59eed8bc706b5219b903704544b66c10 (diff)
downloadpodman-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 'cmd/podman')
-rw-r--r--cmd/podman/exec.go7
-rw-r--r--cmd/podman/varlink/io.podman.varlink4
2 files changed, 3 insertions, 8 deletions
diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go
index 2e9b9e47e..649a7b0db 100644
--- a/cmd/podman/exec.go
+++ b/cmd/podman/exec.go
@@ -2,7 +2,6 @@ package main
import (
"github.com/containers/libpod/cmd/podman/cliconfig"
- "github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/adapter"
"github.com/pkg/errors"
"github.com/spf13/cobra"
@@ -70,11 +69,5 @@ func execCmd(c *cliconfig.ExecValues) error {
defer runtime.DeferredShutdown(false)
exitCode, err = runtime.ExecContainer(getContext(), c)
- if errors.Cause(err) == define.ErrOCIRuntimePermissionDenied {
- exitCode = 126
- }
- if errors.Cause(err) == define.ErrOCIRuntimeNotFound {
- exitCode = 127
- }
return err
}
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index cc66e7df0..f5f3250f7 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -514,7 +514,9 @@ type ExecOpts(
# workdir to run command in container
workdir: ?string,
# slice of keyword=value environment variables
- env: ?[]string
+ env: ?[]string,
+ # string of detach keys
+ detachKeys: ?string
)
# GetVersion returns version and build information of the podman service