summaryrefslogtreecommitdiff
path: root/libpod/container_exec.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-06 14:52:25 +0200
committerGitHub <noreply@github.com>2020-04-06 14:52:25 +0200
commit8dea3c3419629de432bfaaa03d785fdb63b902d5 (patch)
treef850fe12d02296c9fd5d742aab9f3ee70e6a6a49 /libpod/container_exec.go
parent0b1b1710d30e9cb7b4a9aa9e5a269fbd7c7ac95b (diff)
parent4d895dcb5472da19b886ca1662182556242fe5d4 (diff)
downloadpodman-8dea3c3419629de432bfaaa03d785fdb63b902d5.tar.gz
podman-8dea3c3419629de432bfaaa03d785fdb63b902d5.tar.bz2
podman-8dea3c3419629de432bfaaa03d785fdb63b902d5.zip
Merge pull request #5714 from baude/v2attach
v2podman attach
Diffstat (limited to 'libpod/container_exec.go')
-rw-r--r--libpod/container_exec.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_exec.go b/libpod/container_exec.go
index 5469462f8..c1ce8b724 100644
--- a/libpod/container_exec.go
+++ b/libpod/container_exec.go
@@ -221,7 +221,7 @@ func (c *Container) ExecStart(sessionID string) error {
// ExecStartAndAttach starts and attaches to an exec session in a container.
// TODO: Should we include detach keys in the signature to allow override?
// TODO: How do we handle AttachStdin/AttachStdout/AttachStderr?
-func (c *Container) ExecStartAndAttach(sessionID string, streams *AttachStreams) error {
+func (c *Container) ExecStartAndAttach(sessionID string, streams *define.AttachStreams) error {
if !c.batched {
c.lock.Lock()
defer c.lock.Unlock()
@@ -544,7 +544,7 @@ func (c *Container) ExecResize(sessionID string, newSize remotecommand.TerminalS
// Exec emulates the old Libpod exec API, providing a single call to create,
// run, and remove an exec session. Returns exit code and error. Exit code is
// not guaranteed to be set sanely if error is not nil.
-func (c *Container) Exec(config *ExecConfig, streams *AttachStreams, resize <-chan remotecommand.TerminalSize) (int, error) {
+func (c *Container) Exec(config *ExecConfig, streams *define.AttachStreams, resize <-chan remotecommand.TerminalSize) (int, error) {
sessionID, err := c.ExecCreate(config)
if err != nil {
return -1, err