Update containerd with temp console path

crosbymichael · crosbymichael · commit a34bc2b1b9ab · 2017-05-01T16:43:10.000-07:00
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/containerd-shim/process.go b/containerd-shim/process.go
@@ -284,7 +284,11 @@ func (p *process) initializeIO(rootuid, rootgid int) (i *IO, err error) {
 	return i, nil
 }
 func (p *process) Close() error {
-	return p.stdio.Close()
+	err := p.stdio.Close()
+	if p.socket != nil {
+		p.socket.Close()
+	}
+	return err
 }
 
 type stdio struct {
diff --git a/containerd-shim/process_linux.go b/containerd-shim/process_linux.go
@@ -5,9 +5,7 @@ package main
 import (
 	"fmt"
 	"io"
-	"os"
 	"os/exec"
-	"path/filepath"
 	"syscall"
 	"time"
 
@@ -35,11 +33,7 @@ func (p *process) openIO() error {
 	p.stdinCloser = stdinCloser
 
 	if p.state.Terminal {
-		cwd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-		socket, err := runc.NewConsoleSocket(filepath.Join(cwd, "pty.sock"))
+		socket, err := runc.NewTempConsoleSocket()
 		if err != nil {
 			return err
 		}
diff --git a/hack/vendor.sh b/hack/vendor.sh
@@ -32,7 +32,7 @@ clone git github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
 clone git github.com/go-check/check a625211d932a2a643d0d17352095f03fb7774663 https://github.com/cpuguy83/check.git
 
 clone git github.com/crosbymichael/console 8ea0f623ee22736eec36b4ec87664b1d82cf9d15
-clone git github.com/crosbymichael/go-runc cfdb00928e8216dc80be58981368f56e8ba01f8e
+clone git github.com/crosbymichael/go-runc 980b32fc0fe2280022206962a536657010d9e072
 
 # dependencies of docker/pkg/listeners
 clone git github.com/docker/go-connections v0.2.0
diff --git a/vendor/src/github.com/crosbymichael/go-runc/console.go b/vendor/src/github.com/crosbymichael/go-runc/console.go
@@ -4,7 +4,9 @@ package runc
 
 import (
 	"fmt"
+	"io/ioutil"
 	"net"
+	"os"
 	"path/filepath"
 
 	"github.com/crosbymichael/console"
@@ -28,10 +30,33 @@ func NewConsoleSocket(path string) (*Socket, error) {
 	}, nil
 }
 
+// NewTempConsoleSocket returns a temp console socket for use with a container
+// On Close(), the socket is deleted
+func NewTempConsoleSocket() (*Socket, error) {
+	dir, err := ioutil.TempDir("", "pty")
+	if err != nil {
+		return nil, err
+	}
+	abs, err := filepath.Abs(filepath.Join(dir, "pty.sock"))
+	if err != nil {
+		return nil, err
+	}
+	l, err := net.Listen("unix", abs)
+	if err != nil {
+		return nil, err
+	}
+	return &Socket{
+		l:     l,
+		rmdir: true,
+		path:  abs,
+	}, nil
+}
+
 // Socket is a unix socket that accepts the pty master created by runc
 type Socket struct {
-	path string
-	l    net.Listener
+	path  string
+	rmdir bool
+	l     net.Listener
 }
 
 // Path returns the path to the unix socket on disk
@@ -63,5 +88,11 @@ func (c *Socket) ReceiveMaster() (console.Console, error) {
 
 // Close closes the unix socket
 func (c *Socket) Close() error {
-	return c.l.Close()
+	err := c.l.Close()
+	if c.rmdir {
+		if rerr := os.RemoveAll(filepath.Dir(c.path)); err == nil {
+			err = rerr
+		}
+	}
+	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,11 @@ func (p process) initializeIO(rootuid, rootgid int) (i IO, err error) {`
`284`	`284`	`return i, nil`
`285`	`285`	`}`
`286`	`286`	`func (p *process) Close() error {`
`287`		`- return p.stdio.Close()`
	`287`	`+ err := p.stdio.Close()`
	`288`	`+ if p.socket != nil {`
	`289`	`+ p.socket.Close()`
	`290`	`+ }`
	`291`	`+ return err`
`288`	`292`	`}`
`289`	`293`
`290`	`294`	`type stdio struct {`