diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-06 14:52:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 14:52:25 +0200 |
| commit | 8dea3c3419629de432bfaaa03d785fdb63b902d5 (patch) | |
| tree | f850fe12d02296c9fd5d742aab9f3ee70e6a6a49 /libpod/oci.go | |
| parent | 0b1b1710d30e9cb7b4a9aa9e5a269fbd7c7ac95b (diff) | |
| parent | 4d895dcb5472da19b886ca1662182556242fe5d4 (diff) | |
| download | podman-8dea3c3419629de432bfaaa03d785fdb63b902d5.tar.gz podman-8dea3c3419629de432bfaaa03d785fdb63b902d5.tar.bz2 podman-8dea3c3419629de432bfaaa03d785fdb63b902d5.zip | |
Merge pull request #5714 from baude/v2attach
v2podman attach
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index ef46cf5c3..e4fbcb62e 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -4,6 +4,8 @@ import ( "bufio" "net" + "github.com/containers/libpod/libpod/define" + "k8s.io/client-go/tools/remotecommand" ) @@ -141,7 +143,7 @@ type ExecOptions struct { // the container was run as will be used. User string // Streams are the streams that will be attached to the container. - Streams *AttachStreams + Streams *define.AttachStreams // PreserveFDs is a number of additional file descriptors (in addition // to 0, 1, 2) that will be passed to the executed process. The total FDs // passed will be 3 + PreserveFDs. |