Merge pull request #296 from docker/chore-logrus

Use logrus for logging, not containerd's log

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129
 	github.com/compose-spec/compose-go v0.0.0-20200423124427-63dcf8c22cae
 	github.com/containerd/console v1.0.0
-	github.com/containerd/containerd v1.3.5
+	github.com/containerd/containerd v1.3.5 // indirect
 	github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect
 	github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8
 	github.com/docker/distribution v2.7.1+incompatible // indirect

server/proxy/streams.go

@@ -17,8 +17,8 @@
 package proxy
 
 import (
-	"github.com/containerd/containerd/log"
 	"github.com/google/uuid"
+	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/metadata"
 
 	streamsv1 "github.com/docker/api/protos/streams/v1"
@@ -58,7 +58,7 @@ func (p *proxy) NewStream(stream streamsv1.Streaming_NewStreamServer) error {
 	case err := <-errc:
 		return err
 	case <-ctx.Done():
-		log.G(ctx).Debug("client context canceled")
+		logrus.Debug("client context canceled")
 		return ctx.Err()
 	}
 }