diff --git a/api/grpc/server/server_linux.go b/api/grpc/server/server_linux.go index cc624b6..4aa37e8 100644 --- a/api/grpc/server/server_linux.go +++ b/api/grpc/server/server_linux.go @@ -15,7 +15,7 @@ import ( "github.com/opencontainers/runc/libcontainer" "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/system" - ocs "github.com/opencontainers/specs" + ocs "github.com/opencontainers/specs/specs-go" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/hack/vendor.sh b/hack/vendor.sh index f08a2a5..bf4c69c 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -15,7 +15,7 @@ clone git github.com/godbus/dbus master clone git github.com/golang/glog master clone git github.com/golang/protobuf master 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/satori/go.uuid master clone git github.com/syndtr/gocapability master diff --git a/runtime/container.go b/runtime/container.go index d61aa1f..72040d8 100644 --- a/runtime/container.go +++ b/runtime/container.go @@ -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 diff --git a/runtime/container_linux.go b/runtime/container_linux.go index 87e4906..c447d98 100644 --- a/runtime/container_linux.go +++ b/runtime/container_linux.go @@ -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 } diff --git a/runtime/process.go b/runtime/process.go index e571e72..ff80ec5 100644 --- a/runtime/process.go +++ b/runtime/process.go @@ -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 diff --git a/specs/spec_linux.go b/specs/spec_linux.go index 27d9977..625d27f 100644 --- a/specs/spec_linux.go +++ b/specs/spec_linux.go @@ -1,9 +1,8 @@ package specs -import ocs "github.com/opencontainers/specs" +import ocs "github.com/opencontainers/specs/specs-go" type ( - PlatformSpec ocs.LinuxSpec - ProcessSpec ocs.Process - Spec ocs.Spec + ProcessSpec ocs.Process + Spec ocs.Spec ) diff --git a/specs/spec_windows.go b/specs/spec_windows.go index 50cbeff..e21f6be 100644 --- a/specs/spec_windows.go +++ b/specs/spec_windows.go @@ -1,6 +1,6 @@ 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. type ( @@ -8,7 +8,7 @@ type ( 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. // Process contains information to start a specific application inside the container.