Skip to content

fix 1476 let ssh use stdin to type password when docker run with -it #1477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lifubang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix 1476 let ssh use stdin to type password when docker run with -it #1477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 35 additions & 22 deletions cli/command/container/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,37 +182,42 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio
}()
}
attach := config.AttachStdin || config.AttachStdout || config.AttachStderr
statusChan := waitExitOrRemoved(ctx, dockerCli, createResponse.ID, copts.autoRemove)
startc := func() error {
if err := client.ContainerStart(ctx, createResponse.ID, types.ContainerStartOptions{}); err != nil {
// If we have hijackedIOStreamer, we should notify
// hijackedIOStreamer we are going to exit and wait
// to avoid the terminal are not restored.
if attach {
cancelFun()
<-errCh
}

reportError(stderr, "run", err.Error(), false)
if copts.autoRemove {
// wait container to be removed
<-statusChan
}
return runStartContainerErr(err)
}
return nil
}
if attach {
if opts.detachKeys != "" {
dockerCli.ConfigFile().DetachKeys = opts.detachKeys
}

close, err := attachContainer(ctx, dockerCli, &errCh, config, createResponse.ID)
// attach and start the container
// use callback to let user type ssh password when needed
close, err := attachContainer(ctx, dockerCli, &errCh, config, createResponse.ID, startc)

if err != nil {
return err
}
defer close()
}

statusChan := waitExitOrRemoved(ctx, dockerCli, createResponse.ID, copts.autoRemove)

//start the container
if err := client.ContainerStart(ctx, createResponse.ID, types.ContainerStartOptions{}); err != nil {
// If we have hijackedIOStreamer, we should notify
// hijackedIOStreamer we are going to exit and wait
// to avoid the terminal are not restored.
if attach {
cancelFun()
<-errCh
}

reportError(stderr, "run", err.Error(), false)
if copts.autoRemove {
// wait container to be removed
<-statusChan
}
return runStartContainerErr(err)
} else {
// start the container
startc()
}

if (config.AttachStdin || config.AttachStdout || config.AttachStderr) && config.Tty && dockerCli.Out().IsTerminal() {
Expand Down Expand Up @@ -253,7 +258,7 @@ func attachContainer(
errCh *chan error,
config *container.Config,
containerID string,
) (func(), error) {
beforeHijack func() error) (func(), error) {
stdout, stderr := dockerCli.Out(), dockerCli.Err()
var (
out, cerr io.Writer
Expand Down Expand Up @@ -289,6 +294,14 @@ func attachContainer(
return nil, errAttach
}

if beforeHijack != nil {
err := beforeHijack()
if err != nil {
Copy link
Collaborator

@AkihiroSuda AkihiroSuda Oct 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: if err := beforeHijack(); err != nil {

resp.Close()
return nil, err
}
}

ch := make(chan error, 1)
*errCh = ch

Expand Down