erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-16 13:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5203 from QiWang19/disable-detach-key

Browse source 
fix bug "" disable detach keys
This commit is contained in:
OpenShift Merge Robot 2020-02-14 20:13:20 +01:00 • committed by GitHub
commit 0668483cf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pkg/adapter/containers.go
View file

@ -444,9 +444,12 @@ func (r *LocalRuntime) Run(ctx context.Context, c *cliconfig.RunValues, exitCode
}
}
keys, err := r.selectDetachKeys(c.String("detach-keys"))
if err != nil {
return exitCode, err
keys := c.String("detach-keys")
if !c.IsSet("detach-keys") {
keys, err = r.selectDetachKeys(keys)
if err != nil {
return exitCode, err
}
}
// if the container was created as part of a pod, also start its dependencies, if any.
@ -534,9 +537,12 @@ func (r *LocalRuntime) Attach(ctx context.Context, c *cliconfig.AttachValues) er
inputStream = nil
}
keys, err := r.selectDetachKeys(c.DetachKeys)
if err != nil {
return err
keys := c.DetachKeys
if !c.IsSet("detach-keys") {
keys, err = r.selectDetachKeys(keys)
if err != nil {
return err
}
}
// If the container is in a pod, also set to recursively start dependencies
@ -674,9 +680,12 @@ func (r *LocalRuntime) Start(ctx context.Context, c *cliconfig.StartValues, sigP
}
}
keys, err := r.selectDetachKeys(c.DetachKeys)
if err != nil {
return exitCode, err
keys := c.DetachKeys
if !c.IsSet("detach-keys") {
keys, err = r.selectDetachKeys(keys)
if err != nil {
return exitCode, err
}
}
// attach to the container and also start it not already running
@ -975,9 +984,12 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal
streams.AttachOutput = true
streams.AttachError = true
keys, err := r.selectDetachKeys(cli.DetachKeys)
if err != nil {
return ec, err
keys := cli.DetachKeys
if !cli.IsSet("detach-keys") {
keys, err = r.selectDetachKeys(keys)
if err != nil {
return ec, err
}
}
ec, err = ExecAttachCtr(ctx, ctr.Container, cli.Tty, cli.Privileged, env, cmd, cli.User, cli.Workdir, streams, uint(cli.PreserveFDs), keys)