vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Initial windows runtime work

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-03-17 16:09:06 -07:00
parent e5c8c5634a
commit c5843b7615
120 changed files with 11158 additions and 596 deletions
Download patch file Download diff file Expand all files Collapse all files

7
services/execution/service.go
View file

@ -1,7 +1,6 @@
package execution
import (
"fmt"
"sync"
"github.com/containerd/containerd"
@ -209,11 +208,7 @@ func (s *Service) Exec(ctx context.Context, r *api.ExecRequest) (*api.ExecRespon
if err != nil {
return nil, err
}
l, ok := c.(containerd.LinuxContainer)
if !ok {
return nil, fmt.Errorf("cannot exec into a non linux container")
}
process, err := l.Exec(ctx, containerd.ExecOpts{
process, err := c.Exec(ctx, containerd.ExecOpts{
Spec: r.Spec.Value,
IO: containerd.IO{
Stdin: r.Stdin,

4
services/rootfs/service.go
View file

@ -1,8 +1,6 @@
package rootfs
import (
"syscall"
"github.com/containerd/containerd"
rootfsapi "github.com/containerd/containerd/api/services/rootfs"
containerd_v1_types "github.com/containerd/containerd/api/types/mount"
@ -104,7 +102,7 @@ func (mounter) Mount(dir string, mounts ...containerd.Mount) error {
}
func (mounter) Unmount(dir string) error {
return syscall.Unmount(dir, 0)
return containerd.Unmount(dir, 0)
}
func emptyResolver(digest.Digest) digest.Digest {