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

Getting ctr closer to compiling on Windows

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2016-02-29 10:48:39 -08:00
parent 8d2051232a
commit d4ca79c978
18 changed files with 115 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

20
runtime/container.go
View file

@ -5,9 +5,9 @@ import (
"io/ioutil"
"os"
"path/filepath"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/containerd/specs"
)
type Container interface {
@ -18,7 +18,7 @@ type Container interface {
// Start starts the init process of the container
Start(checkpoint string, s Stdio) (Process, error)
// Exec starts another process in an existing container
Exec(string, ProcessSpec, Stdio) (Process, error)
Exec(string, specs.ProcessSpec, Stdio) (Process, error)
// Delete removes the container's state and any resources
Delete() error
// Processes returns all the containers processes that have been added
@ -175,8 +175,8 @@ func (c *container) Labels() []string {
return c.labels
}
func (c *container) readSpec() (*PlatformSpec, error) {
var spec PlatformSpec
func (c *container) readSpec() (*specs.PlatformSpec, error) {
var spec specs.PlatformSpec
f, err := os.Open(filepath.Join(c.bundle, "config.json"))
if err != nil {
return nil, err
@ -188,18 +188,6 @@ func (c *container) readSpec() (*PlatformSpec, error) {
return &spec, nil
}
func (c *container) State() State {
proc := c.processes["init"]
if proc == nil || proc.pid == 0 {
return Stopped
}
err := syscall.Kill(proc.pid, 0)
if err != nil && err == syscall.ESRCH {
return Stopped
}
return Running
}
func (c *container) Delete() error {
return os.RemoveAll(filepath.Join(c.root, c.id))
}