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

Update specs imports for specs-go

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-03-15 11:31:32 -07:00
parent 2db0341e38
commit e637c1ea80
7 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
runtime/container.go
View file

@ -187,8 +187,8 @@ func (c *container) Labels() []string {
return c.labels
}
func (c *container) readSpec() (*specs.PlatformSpec, error) {
var spec specs.PlatformSpec
func (c *container) readSpec() (*specs.Spec, error) {
var spec specs.Spec
f, err := os.Open(filepath.Join(c.bundle, "config.json"))
if err != nil {
return nil, err

4
runtime/container_linux.go
View file

@ -14,10 +14,10 @@ import (
"github.com/docker/containerd/specs"
"github.com/opencontainers/runc/libcontainer"
ocs "github.com/opencontainers/specs"
ocs "github.com/opencontainers/specs/specs-go"
)
func getRootIDs(s *specs.PlatformSpec) (int, int, error) {
func getRootIDs(s *specs.Spec) (int, int, error) {
if s == nil {
return 0, 0, nil
}

2
runtime/process.go
View file

@ -45,7 +45,7 @@ type processConfig struct {
id string
root string
processSpec specs.ProcessSpec
spec *specs.PlatformSpec
spec *specs.Spec
c *container
stdio Stdio
exec bool