diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-22 22:46:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 22:46:18 +0200 |
| commit | a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff (patch) | |
| tree | 2fe83dbecabff2df6aabfe7204418fd6fa05919e /cmd/podman/cliconfig/config.go | |
| parent | cf9efa90e5dcf89e10408eae5229c4ce904d9fc7 (diff) | |
| parent | 53e1ede46b030ad2aeecbdd7b2a385b60500ac4c (diff) | |
| download | podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.tar.gz podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.tar.bz2 podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.zip | |
Merge pull request #3143 from haircommander/conmon-exec
use conmon for exec
Diffstat (limited to 'cmd/podman/cliconfig/config.go')
| -rw-r--r-- | cmd/podman/cliconfig/config.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go index be380cda0..025f40cf6 100644 --- a/cmd/podman/cliconfig/config.go +++ b/cmd/podman/cliconfig/config.go @@ -119,14 +119,15 @@ type DiffValues struct { type ExecValues struct { PodmanCommand - Env []string - Privileged bool - Interfactive bool - Tty bool - User string - Latest bool - Workdir string - PreserveFDs int + DetachKeys string + Env []string + Privileged bool + Interactive bool + Tty bool + User string + Latest bool + Workdir string + PreserveFDs int } type ImageExistsValues struct { |