Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1472 from lifubang/sshlogs 

Enhancement: don't need to type ssh password twice when docker logs with ssh
This commit is contained in:
Silvin Lubecki 2018-10-26 15:41:39 +01:00 committed by GitHub
parent 0904fbfc77 aba8821f60
commit 6b71e84ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/command/container/logs.go
View File

@ -50,6 +50,11 @@ func NewLogsCommand(dockerCli command.Cli) *cobra.Command {
func runLogs(dockerCli command.Cli, opts *logsOptions) error { func runLogs(dockerCli command.Cli, opts *logsOptions) error {
ctx := context.Background() ctx := context.Background()
c, err := dockerCli.Client().ContainerInspect(ctx, opts.container)
if err != nil {
return err
}
options := types.ContainerLogsOptions{ options := types.ContainerLogsOptions{
ShowStdout: true, ShowStdout: true,
ShowStderr: true, ShowStderr: true,
@ -60,17 +65,12 @@ func runLogs(dockerCli command.Cli, opts *logsOptions) error {
Tail: opts.tail, Tail: opts.tail,
Details: opts.details, Details: opts.details,
} }
responseBody, err := dockerCli.Client().ContainerLogs(ctx, opts.container, options) responseBody, err := dockerCli.Client().ContainerLogs(ctx, c.ID, options)
if err != nil { if err != nil {
return err return err
} }
defer responseBody.Close() defer responseBody.Close()
c, err := dockerCli.Client().ContainerInspect(ctx, opts.container)
if err != nil {
return err
}
if c.Config.Tty { if c.Config.Tty {
_, err = io.Copy(dockerCli.Out(), responseBody) _, err = io.Copy(dockerCli.Out(), responseBody)
} else { } else {