Merge pull request #383 from q384566678/linux-defer

hqhq · web-flow · commit a138a0566aa6 · 2017-05-31T15:02:08.000+08:00
validate: fix spec nil dereference
diff --git a/validate/validate.go b/validate/validate.go
@@ -89,8 +89,10 @@ func (v *Validator) CheckAll() (msgs []string) {
 	msgs = append(msgs, v.CheckPlatform()...)
 	msgs = append(msgs, v.CheckProcess()...)
 	msgs = append(msgs, v.CheckOS()...)
-	msgs = append(msgs, v.CheckLinux()...)
 	msgs = append(msgs, v.CheckHooks()...)
+	if v.spec.Linux != nil {
+		msgs = append(msgs, v.CheckLinux()...)
+	}
 
 	return
 }
@@ -259,7 +261,9 @@ func (v *Validator) CheckProcess() (msgs []string) {
 		}
 	}
 
-	msgs = append(msgs, v.CheckCapabilities()...)
+	if v.spec.Process.Capabilities != nil {
+		msgs = append(msgs, v.CheckCapabilities()...)
+	}
 	msgs = append(msgs, v.CheckRlimits()...)
 
 	if v.spec.Platform.OS == "linux" {

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,10 @@ func (v *Validator) CheckAll() (msgs []string) {`
`89`	`89`	`msgs = append(msgs, v.CheckPlatform()...)`
`90`	`90`	`msgs = append(msgs, v.CheckProcess()...)`
`91`	`91`	`msgs = append(msgs, v.CheckOS()...)`
`92`		`- msgs = append(msgs, v.CheckLinux()...)`
`93`	`92`	`msgs = append(msgs, v.CheckHooks()...)`
	`93`	`+ if v.spec.Linux != nil {`
	`94`	`+ msgs = append(msgs, v.CheckLinux()...)`
	`95`	`+ }`
`94`	`96`
`95`	`97`	`return`
`96`	`98`	`}`
`@@ -259,7 +261,9 @@ func (v *Validator) CheckProcess() (msgs []string) {`
`259`	`261`	`}`
`260`	`262`	`}`
`261`	`263`
`262`		`- msgs = append(msgs, v.CheckCapabilities()...)`
	`264`	`+ if v.spec.Process.Capabilities != nil {`
	`265`	`+ msgs = append(msgs, v.CheckCapabilities()...)`
	`266`	`+ }`
`263`	`267`	`msgs = append(msgs, v.CheckRlimits()...)`
`264`	`268`
`265`	`269`	`if v.spec.Platform.OS == "linux" {`