add selinux deps

Signed-off-by: Ma Shimiao <[email protected]>
opencontainers · Nov 23, 2017 · 38713d1 · 38713d1
1 parent 9ac8d75
commit 38713d1
Show file tree

Hide file tree

Showing 8 changed files with 1,172 additions and 2 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go
@@ -785,7 +785,7 @@ func validateMountLabel(spec *rspec.Spec) error {
 		if err != nil {
 			return fmt.Errorf("Failed to get mountLabel of %v", mount.Destination)
 		}
-		if fileLabel != spec.Linux.MountLabel {
+		if spec.Linux != nil && fileLabel != spec.Linux.MountLabel {
 			return fmt.Errorf("Expected mountLabel %v, actual %v", spec.Linux.MountLabel, fileLabel)
 		}
 	}

diff --git a/validate/validate.go b/validate/validate.go
@@ -765,7 +765,7 @@ func (v *Validator) CheckLinux() (errs error) {
 
 	if v.spec.Linux.MountLabel != "" {
 		if err := label.Validate(v.spec.Linux.MountLabel); err != nil {
-			msgs = append(msgs, "mountLabel %v is invalid", v.spec.Linux.MountLabel)
+			errs = multierror.Append(errs, fmt.Errorf("mountLabel %v is invalid", v.spec.Linux.MountLabel))
 		}
 	}
 

diff --git a/vendor/github.com/opencontainers/selinux/LICENSE b/vendor/github.com/opencontainers/selinux/LICENSE
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/label/label.go b/vendor/github.com/opencontainers/selinux/go-selinux/label/label.go