summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/tunnel/containers.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-21 16:02:52 +0200
committerGitHub <noreply@github.com>2020-05-21 16:02:52 +0200
commita852afab2f37026fa8a45d115c61cd77fb3e7ef1 (patch)
treef47d5211873d31dadb3b89b69d66397c744b2231 /pkg/domain/infra/tunnel/containers.go
parent500ad31d1bd1aee1458b17f05c2dfb7937786e87 (diff)
parent24158d4a2eaa84088ca1ca1e85a0bcbb8399c2ac (diff)
downloadpodman-a852afab2f37026fa8a45d115c61cd77fb3e7ef1.tar.gz
podman-a852afab2f37026fa8a45d115c61cd77fb3e7ef1.tar.bz2
podman-a852afab2f37026fa8a45d115c61cd77fb3e7ef1.zip
Merge pull request #6270 from mheon/detached_exec
Implement detached exec
Diffstat (limited to 'pkg/domain/infra/tunnel/containers.go')
-rw-r--r--pkg/domain/infra/tunnel/containers.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index dcaac99f2..445b49ba8 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -330,10 +330,14 @@ func (ic *ContainerEngine) ContainerAttach(ctx context.Context, nameOrId string,
return containers.Attach(ic.ClientCxt, nameOrId, &options.DetachKeys, nil, bindings.PTrue, options.Stdin, options.Stdout, options.Stderr, nil)
}
-func (ic *ContainerEngine) ContainerExec(ctx context.Context, nameOrId string, options entities.ExecOptions) (int, error) {
+func (ic *ContainerEngine) ContainerExec(ctx context.Context, nameOrId string, options entities.ExecOptions, streams define.AttachStreams) (int, error) {
return 125, errors.New("not implemented")
}
+func (ic *ContainerEngine) ContainerExecDetached(ctx context.Context, nameOrID string, options entities.ExecOptions) (string, error) {
+ return "", errors.New("not implemented")
+}
+
func startAndAttach(ic *ContainerEngine, name string, detachKeys *string, input, output, errput *os.File) error { //nolint
attachErr := make(chan error)
attachReady := make(chan bool)