Merge pull request #2551 from crosbymichael/stdin-block

Don't block on STDIN open

runtime/v2/runc/service.go

@@ -98,8 +98,7 @@ type service struct {
 	ec        chan runcC.Exit
 	ep        *epoller
 
-	id string
-	// Filled by Create()
+	id     string
 	bundle string
 	cg     cgroups.Cgroup
 }

runtime/v2/runc/service_linux.go

@@ -42,7 +42,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
 	}
 
 	if stdin != "" {
-		in, err := fifo.OpenFifo(ctx, stdin, syscall.O_RDONLY, 0)
+		in, err := fifo.OpenFifo(ctx, stdin, syscall.O_RDONLY|syscall.O_NONBLOCK, 0)
 		if err != nil {
 			return nil, err
 		}