Merge pull request #1518 from crosbymichael/rc6

Update runtime-spec to rc6+

Author: Mrunal Patel

libcontainer/specconv/example.go

@@ -14,7 +14,7 @@ func sPtr(s string) *string { return &s }
 func Example() *specs.Spec {
 	return &specs.Spec{
 		Version: specs.Version,
-		Root: specs.Root{
+		Root: &specs.Root{
 			Path:     "rootfs",
 			Readonly: true,
 		},
@@ -57,7 +57,7 @@ func Example() *specs.Spec {
 					"CAP_NET_BIND_SERVICE",
 				},
 			},
-			Rlimits: []specs.LinuxRlimit{
+			Rlimits: []specs.POSIXRlimit{
 				{
 					Type: "RLIMIT_NOFILE",
 					Hard: uint64(1024),

libcontainer/specconv/spec_linux.go

@@ -162,6 +162,9 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
 		return nil, err
 	}
 	spec := opts.Spec
+	if spec.Root == nil {
+		return nil, fmt.Errorf("Root must be specified")
+	}
 	rootfsPath := spec.Root.Path
 	if !filepath.IsAbs(rootfsPath) {
 		rootfsPath = filepath.Join(cwd, rootfsPath)
@@ -377,6 +380,9 @@ func createCgroupConfig(opts *CreateOpts) (*configs.Cgroup, error) {
 		if r.Memory.Swappiness != nil {
 			c.Resources.MemorySwappiness = r.Memory.Swappiness
 		}
+		if r.Memory.DisableOOMKiller != nil {
+			c.Resources.OomKillDisable = *r.Memory.DisableOOMKiller
+		}
 	}
 	if r.CPU != nil {
 		if r.CPU.Shares != nil {
@@ -459,9 +465,6 @@ func createCgroupConfig(opts *CreateOpts) (*configs.Cgroup, error) {
 			Limit:    l.Limit,
 		})
 	}
-	if r.DisableOOMKiller != nil {
-		c.Resources.OomKillDisable = *r.DisableOOMKiller
-	}
 	if r.Network != nil {
 		if r.Network.ClassID != nil {
 			c.Resources.NetClsClassid = *r.Network.ClassID

spec.go

@@ -133,7 +133,7 @@ func loadSpec(cPath string) (spec *specs.Spec, err error) {
 	return spec, validateProcessSpec(spec.Process)
 }
 
-func createLibContainerRlimit(rlimit specs.LinuxRlimit) (configs.Rlimit, error) {
+func createLibContainerRlimit(rlimit specs.POSIXRlimit) (configs.Rlimit, error) {
 	rl, err := strToRlimit(rlimit.Type)
 	if err != nil {
 		return configs.Rlimit{}, err

vendor.conf

@@ -1,7 +1,7 @@
 # OCI runtime-spec. When updating this, make sure you use a version tag rather
 # than a commit ID so it's much more obvious what version of the spec we are
 # using.
-github.com/opencontainers/runtime-spec 198f23f827eea397d4331d7eb048d9d4c7ff7bee
+github.com/opencontainers/runtime-spec 96de01bbb42c7af89bff100e10a9f0fb62e75bfb
 # Core libcontainer functionality.
 github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08
 github.com/opencontainers/selinux v1.0.0-rc1