Merge pull request #1036 from athomason/1035-update-runtime-spec

Update runtime-spec to current upstream

Author: hqhq

Godeps/Godeps.json

@@ -258,7 +258,7 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec *specs.Spec) (*
 		Resources: &configs.Resources{},
 	}
 
-	if spec.Linux.CgroupsPath != nil {
+	if spec.Linux != nil && spec.Linux.CgroupsPath != nil {
 		myCgroupPath = libcontainerUtils.CleanPath(*spec.Linux.CgroupsPath)
 		if useSystemdCgroup {
 			myCgroupPath = *spec.Linux.CgroupsPath
@@ -289,6 +289,9 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec *specs.Spec) (*
 	}
 
 	c.Resources.AllowedDevices = allowedDevices
+	if spec.Linux == nil {
+		return c, nil
+	}
 	r := spec.Linux.Resources
 	if r == nil {
 		return c, nil

Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go

@@ -12,7 +12,9 @@ func TestLinuxCgroupsPathSpecified(t *testing.T) {
 	cgroupsPath := "/user/cgroups/path/id"
 
 	spec := &specs.Spec{}
-	spec.Linux.CgroupsPath = &cgroupsPath
+	spec.Linux = &specs.Linux{
+		CgroupsPath: &cgroupsPath,
+	}
 
 	cgroup, err := createCgroupConfig("ContainerID", false, spec)
 	if err != nil {

Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/state.go

@@ -145,7 +145,7 @@ container on your host.`,
 					Options:     []string{"nosuid", "noexec", "nodev", "relatime", "ro"},
 				},
 			},
-			Linux: specs.Linux{
+			Linux: &specs.Linux{
 				MaskedPaths: []string{
 					"/proc/kcore",
 					"/proc/latency_stats",

Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go

@@ -78,7 +78,7 @@ function teardown() {
     run git reset --hard "${SPEC_COMMIT}"
   )
   [ "$status" -eq 0 ]
-  [ -e src/runtime-spec/schema/schema.json ]
+  [ -e src/runtime-spec/schema/config-schema.json ]
 
   run bash -c "GOPATH='$GOPATH' go get github.com/xeipuuv/gojsonschema"
   [ "$status" -eq 0 ]
@@ -89,7 +89,7 @@ function teardown() {
   runc spec
   [ -e config.json ]
 
-  run ./validate src/runtime-spec/schema/schema.json config.json
+  run ./validate src/runtime-spec/schema/config-schema.json config.json
   [ "$status" -eq 0 ]
   [[ "${lines[0]}" == *"The document is valid"* ]]
 }