summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorPeter Hunt <pehunt@redhat.com>2019-07-22 15:56:58 -0400
committerPeter Hunt <pehunt@redhat.com>2019-07-23 13:29:33 -0400
commit5bf99a82ff48cd5097182c55fe1347daf793324b (patch)
tree726fc427fba4615f2262932d71a8f9676604e3e4 /pkg
parent479eeac62cd74e32cbe74fc8afbfc82d4d8a8abd (diff)
downloadpodman-5bf99a82ff48cd5097182c55fe1347daf793324b.tar.gz
podman-5bf99a82ff48cd5097182c55fe1347daf793324b.tar.bz2
podman-5bf99a82ff48cd5097182c55fe1347daf793324b.zip
add detach keys support for remote
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/adapter/containers_remote.go2
-rw-r--r--pkg/varlinkapi/containers.go15
2 files changed, 11 insertions, 6 deletions
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index 7fce30378..3b1b80315 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -1017,7 +1017,6 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal
// Check if we are attached to a terminal. If we are, generate resize
// events, and set the terminal to raw mode
- // TODO FIXME tty
if haveTerminal && cli.Tty {
cancel, oldTermState, err := handleTerminalAttach(ctx, resize)
if err != nil {
@@ -1038,6 +1037,7 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal
User: &cli.User,
Workdir: &cli.Workdir,
Env: &envs,
+ DetachKeys: &cli.DetachKeys,
}
inputStream := os.Stdin
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index fa17bed84..97eb36014 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -782,6 +782,9 @@ func (i *LibpodAPI) ExecContainer(call iopodman.VarlinkCall, opts iopodman.ExecO
fmt.Sprintf("exec requires a running container, %s is %s", ctr.ID(), state.String()))
}
+ // ACK the client upgrade request
+ call.ReplyExecContainer()
+
envs := []string{}
if opts.Env != nil {
envs = *opts.Env
@@ -796,8 +799,11 @@ func (i *LibpodAPI) ExecContainer(call iopodman.VarlinkCall, opts iopodman.ExecO
if opts.Workdir != nil {
workDir = *opts.Workdir
}
- // ACK the client upgrade request
- call.ReplyExecContainer()
+
+ var detachKeys string
+ if opts.DetachKeys != nil {
+ detachKeys = *opts.DetachKeys
+ }
resizeChan := make(chan remotecommand.TerminalSize)
@@ -818,11 +824,10 @@ func (i *LibpodAPI) ExecContainer(call iopodman.VarlinkCall, opts iopodman.ExecO
}
}()
- // TODO FIXME detach keys
go func() {
- ec, err := ctr.Exec(opts.Tty, opts.Privileged, envs, opts.Cmd, user, workDir, streams, 0, resizeChan, "")
+ ec, err := ctr.Exec(opts.Tty, opts.Privileged, envs, opts.Cmd, user, workDir, streams, 0, resizeChan, detachKeys)
if err != nil {
- logrus.Errorf("ExecContainer Exec err %s, %s\n", err.Error(), errors.Cause(err).Error())
+ logrus.Errorf(err.Error())
}
ecErrChan <- ExitCodeError{
uint32(ec),