tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #324 from docker/fix-non-console 

Make sure we can have a console
This commit is contained in:
Guillaume Tardif 2020-07-02 13:58:48 +02:00 committed by GitHub
parent 8e8c868a70 e4354c82d1
commit 15cdcf831e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/cmd/logs.go
View File

@ -18,6 +18,8 @@ package cmd
import ( import (
"context" "context"
"io"
"os"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -55,11 +57,17 @@ func runLogs(ctx context.Context, containerName string, opts logsOpts) error {
if err != nil { if err != nil {
return errors.Wrap(err, "cannot connect to backend") return errors.Wrap(err, "cannot connect to backend")
} }
var con io.Writer
con = os.Stdout
if c, err := console.ConsoleFromFile(os.Stdout); err == nil {
con = c
}
req := containers.LogsRequest{ req := containers.LogsRequest{
Follow: opts.Follow, Follow: opts.Follow,
Tail: opts.Tail, Tail: opts.Tail,
Writer: console.Current(), Writer: con,
} }
return c.ContainerService().Logs(ctx, containerName, req) return c.ContainerService().Logs(ctx, containerName, req)