summaryrefslogtreecommitdiff
path: root/libpod/container_exec.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-25 19:00:14 +0100
committerGitHub <noreply@github.com>2021-02-25 19:00:14 +0100
commitb220d6cd06360d6b868cd7fb7c32d2602aab69a5 (patch)
tree6777cc2c23306d1a6b87ef40b9fe4eab2764b7dd /libpod/container_exec.go
parent9ec8106841c55bc085012727748e2d73826be97d (diff)
parent24d9bda7ff8a3e6a9f249401e05e35e73284ae61 (diff)
downloadpodman-b220d6cd06360d6b868cd7fb7c32d2602aab69a5.tar.gz
podman-b220d6cd06360d6b868cd7fb7c32d2602aab69a5.tar.bz2
podman-b220d6cd06360d6b868cd7fb7c32d2602aab69a5.zip
Merge pull request #9518 from baude/pruneremotecommand
prune remotecommand dependency
Diffstat (limited to 'libpod/container_exec.go')
-rw-r--r--libpod/container_exec.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/libpod/container_exec.go b/libpod/container_exec.go
index 8d63ef90f..bb43287d9 100644
--- a/libpod/container_exec.go
+++ b/libpod/container_exec.go
@@ -13,7 +13,6 @@ import (
"github.com/containers/storage/pkg/stringid"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
- "k8s.io/client-go/tools/remotecommand"
)
// ExecConfig contains the configuration of an exec session
@@ -676,7 +675,7 @@ func (c *Container) ExecRemove(sessionID string, force bool) error {
// ExecResize resizes the TTY of the given exec session. Only available if the
// exec session created a TTY.
-func (c *Container) ExecResize(sessionID string, newSize remotecommand.TerminalSize) error {
+func (c *Container) ExecResize(sessionID string, newSize define.TerminalSize) error {
if !c.batched {
c.lock.Lock()
defer c.lock.Unlock()
@@ -703,7 +702,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 *define.AttachStreams, resize <-chan remotecommand.TerminalSize) (int, error) {
+func (c *Container) Exec(config *ExecConfig, streams *define.AttachStreams, resize <-chan define.TerminalSize) (int, error) {
sessionID, err := c.ExecCreate(config)
if err != nil {
return -1, err