Switch to containerd v1.0.2

ernoaapa · Feb 15, 2018 · 4d82948 · 4d82948
1 parent 48b7e23
commit 4d82948
Show file tree

Hide file tree

Showing 47 changed files with 623 additions and 2,221 deletions.
diff --git a/pkg/runtime/containerd.go b/pkg/runtime/containerd.go
@@ -523,15 +523,7 @@ func (c *ContainerdClient) Exec(namespace, name, id string, args []string, tty b
 	pspec.Terminal = tty
 	pspec.Args = args
 
-	ioOpts := []cio.Opt{
-		cio.WithStreams(io.Stdin, io.Stdout, io.Stderr),
-	}
-
-	if tty {
-		ioOpts = append(ioOpts, cio.WithTerminal)
-	}
-
-	process, err := task.Exec(ctx, id, pspec, cio.NewCreator(ioOpts...))
+	process, err := task.Exec(ctx, id, pspec, cio.NewIOWithTerminal(io.Stdin, io.Stdout, io.Stderr, tty))
 	if err != nil {
 		return err
 	}
@@ -565,7 +557,7 @@ func (c *ContainerdClient) Attach(namespace, name string, io AttachIO) error {
 		return errors.Wrapf(err, "Cannot attach to container [%s] in namespace [%s]", name, namespace)
 	}
 
-	task, taskErr := container.Task(ctx, cio.NewAttach(cio.WithStreams(io.Stdin, io.Stdout, io.Stderr)))
+	task, taskErr := container.Task(ctx, cio.WithAttach(io.Stdin, io.Stdout, io.Stderr))
 	if taskErr != nil {
 		return taskErr
 	}

diff --git a/vendor/github.com/containerd/containerd/README.md b/vendor/github.com/containerd/containerd/README.md
diff --git a/vendor/github.com/containerd/containerd/cio/io.go b/vendor/github.com/containerd/containerd/cio/io.go