From e4354c82d121ad4569b8cb9fdbcd1821f395f901 Mon Sep 17 00:00:00 2001
From: Djordje Lukic <djordje.lukic@docker.com>
Date: Thu, 2 Jul 2020 11:49:39 +0200
Subject: [PATCH] Make sure we can have a console

---
 cli/cmd/logs.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/cli/cmd/logs.go b/cli/cmd/logs.go
index d00a1acf..548aa47f 100644
--- a/cli/cmd/logs.go
+++ b/cli/cmd/logs.go
@@ -18,6 +18,8 @@ package cmd
 
 import (
 	"context"
+	"io"
+	"os"
 
 	"github.com/containerd/console"
 	"github.com/pkg/errors"
@@ -55,11 +57,17 @@ func runLogs(ctx context.Context, containerName string, opts logsOpts) error {
 	if err != nil {
 		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{
 		Follow: opts.Follow,
 		Tail:   opts.Tail,
-		Writer: console.Current(),
+		Writer: con,
 	}
 
 	return c.ContainerService().Logs(ctx, containerName, req)