Merge pull request #1600 from crosbymichael/console

Bump console and sys deps

Author: dqminh

contrib/cmd/recvtty/recvtty.go

@@ -101,25 +101,26 @@ func handleSingle(path string) error {
 	if err != nil {
 		return err
 	}
-	console, err := console.ConsoleFromFile(master)
+	c, err := console.ConsoleFromFile(master)
 	if err != nil {
 		return err
 	}
+	console.ClearONLCR(c.Fd())
 
 	// Copy from our stdio to the master fd.
 	quitChan := make(chan struct{})
 	go func() {
-		io.Copy(os.Stdout, console)
+		io.Copy(os.Stdout, c)
 		quitChan <- struct{}{}
 	}()
 	go func() {
-		io.Copy(console, os.Stdin)
+		io.Copy(c, os.Stdin)
 		quitChan <- struct{}{}
 	}()
 
 	// Only close the master fd once we've stopped copying.
 	<-quitChan
-	console.Close()
+	c.Close()
 	return nil
 }
 

libcontainer/integration/execin_test.go

@@ -309,7 +309,7 @@ func TestExecInTTY(t *testing.T) {
 			}
 			return
 		}
-		console.SaneTerminal(f)
+		console.ClearONLCR(c.Fd())
 		dc <- &cdata{
 			c: c,
 		}

tty.go

@@ -80,6 +80,7 @@ func (t *tty) recvtty(process *libcontainer.Process, socket *os.File) error {
 	if err != nil {
 		return err
 	}
+	console.ClearONLCR(cons.Fd())
 	epoller, err := console.NewEpoller()
 	if err != nil {
 		return err

vendor.conf

@@ -18,9 +18,8 @@ github.com/golang/protobuf 18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8
 github.com/docker/docker 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d
 github.com/docker/go-units v0.2.0
 github.com/urfave/cli d53eb991652b1d438abdd34ce4bfa3ef1539108e
-golang.org/x/sys 0e0164865330d5cf1c00247be08330bf96e2f87c https://github.com/golang/sys
+golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce https://github.com/golang/sys
 
 # console dependencies
-github.com/containerd/console 2ce1c681f3c3c0dfa7d0af289428d36567c9a6bc
-github.com/Azure/go-ansiterm fa152c58bc15761d0200cb75fe958b89a9d4888e
+github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e
 github.com/pkg/errors v0.8.0