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

2
api/grpc/server/server_linux.go
View file

@ -15,7 +15,7 @@ import (
"github.com/opencontainers/runc/libcontainer" "github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/runc/libcontainer/system"
ocs "github.com/opencontainers/specs" ocs "github.com/opencontainers/specs/specs-go"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
hack/vendor.sh
View file

@ -15,7 +15,7 @@ clone git github.com/godbus/dbus master
clone git github.com/golang/glog master clone git github.com/golang/glog master
clone git github.com/golang/protobuf master clone git github.com/golang/protobuf master
clone git github.com/opencontainers/runc 2faade9bc7815d0ccdf1fe9608bc75f43aa983ae clone git github.com/opencontainers/runc 2faade9bc7815d0ccdf1fe9608bc75f43aa983ae
clone git github.com/opencontainers/specs 3ce138b1934bf227a418e241ead496c383eaba1c clone git github.com/opencontainers/specs/specs-go 3ce138b1934bf227a418e241ead496c383eaba1c
clone git github.com/rcrowley/go-metrics master clone git github.com/rcrowley/go-metrics master
clone git github.com/satori/go.uuid master clone git github.com/satori/go.uuid master
clone git github.com/syndtr/gocapability master clone git github.com/syndtr/gocapability master

4
runtime/container.go
View file

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

4
runtime/container_linux.go
View file

@ -14,10 +14,10 @@ import (
"github.com/docker/containerd/specs" "github.com/docker/containerd/specs"
"github.com/opencontainers/runc/libcontainer" "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 { if s == nil {
return 0, 0, nil return 0, 0, nil
} }

2
runtime/process.go
View file

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

7
specs/spec_linux.go
View file

@ -1,9 +1,8 @@
package specs package specs
import ocs "github.com/opencontainers/specs" import ocs "github.com/opencontainers/specs/specs-go"
type ( type (
PlatformSpec ocs.LinuxSpec ProcessSpec ocs.Process
ProcessSpec ocs.Process Spec ocs.Spec
Spec ocs.Spec
) )

4
specs/spec_windows.go
View file

@ -1,6 +1,6 @@
package specs package specs
// Temporary Windows version of the spec in lieu of opencontainers/specs having // Temporary Windows version of the spec in lieu of opencontainers/specs/specs-go having
// Windows support currently. // Windows support currently.
type ( type (
@ -8,7 +8,7 @@ type (
ProcessSpec Process ProcessSpec Process
) )
// This is a temporary module in lieu of opencontainers/specs being compatible // This is a temporary module in lieu of opencontainers/specs/specs-go being compatible
// currently on Windows. // currently on Windows.
// Process contains information to start a specific application inside the container. // Process contains information to start a specific application inside the container.