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 /pkg/adapter/terminal_linux.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 'pkg/adapter/terminal_linux.go')
-rw-r--r-- | pkg/adapter/terminal_linux.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/adapter/terminal_linux.go b/pkg/adapter/terminal_linux.go index ef5a6f926..a56704be6 100644 --- a/pkg/adapter/terminal_linux.go +++ b/pkg/adapter/terminal_linux.go @@ -7,6 +7,7 @@ import ( "os" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh/terminal" @@ -14,7 +15,7 @@ import ( ) // ExecAttachCtr execs and attaches to a container -func ExecAttachCtr(ctx context.Context, ctr *libpod.Container, tty, privileged bool, env map[string]string, cmd []string, user, workDir string, streams *libpod.AttachStreams, preserveFDs uint, detachKeys string) (int, error) { +func ExecAttachCtr(ctx context.Context, ctr *libpod.Container, tty, privileged bool, env map[string]string, cmd []string, user, workDir string, streams *define.AttachStreams, preserveFDs uint, detachKeys string) (int, error) { resize := make(chan remotecommand.TerminalSize) haveTerminal := terminal.IsTerminal(int(os.Stdin.Fd())) @@ -69,7 +70,7 @@ func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr, defer cancel() } - streams := new(libpod.AttachStreams) + streams := new(define.AttachStreams) streams.OutputStream = stdout streams.ErrorStream = stderr streams.InputStream = bufio.NewReader(stdin) |