Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump console and sys deps #1600

Merged
merged 2 commits into from
Sep 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions contrib/cmd/recvtty/recvtty.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion libcontainer/integration/execin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ func TestExecInTTY(t *testing.T) {
}
return
}
console.SaneTerminal(f)
console.ClearONLCR(c.Fd())
dc <- &cdata{
c: c,
}
Expand Down
1 change: 1 addition & 0 deletions tty.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 0 additions & 21 deletions vendor/github.com/Azure/go-ansiterm/LICENSE

This file was deleted.

12 changes: 0 additions & 12 deletions vendor/github.com/Azure/go-ansiterm/README.md

This file was deleted.

188 changes: 0 additions & 188 deletions vendor/github.com/Azure/go-ansiterm/constants.go

This file was deleted.

7 changes: 0 additions & 7 deletions vendor/github.com/Azure/go-ansiterm/context.go

This file was deleted.

49 changes: 0 additions & 49 deletions vendor/github.com/Azure/go-ansiterm/csi_entry_state.go

This file was deleted.

38 changes: 0 additions & 38 deletions vendor/github.com/Azure/go-ansiterm/csi_param_state.go

This file was deleted.

Loading