Skip to content

Commit

Permalink
Merge pull request #31 from ernoaapa/containerd-v1.0.2
Browse files Browse the repository at this point in the history
Switch to containerd v1.0.2
  • Loading branch information
ernoaapa authored Feb 15, 2018
2 parents 48b7e23 + 4d82948 commit 0d701fd
Show file tree
Hide file tree
Showing 47 changed files with 623 additions and 2,221 deletions.
12 changes: 2 additions & 10 deletions pkg/runtime/containerd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions vendor/github.com/containerd/containerd/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

242 changes: 123 additions & 119 deletions vendor/github.com/containerd/containerd/cio/io.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0d701fd

Please sign in to comment.