From 73b6992cbd703fe97a983d7b406f9fc4ca618bff Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 11 Apr 2017 09:38:55 +0800 Subject: [PATCH 1/2] validate: add windows validation in checkos Signed-off-by: zhouhao --- validate/validate.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/validate/validate.go b/validate/validate.go index 0c4ebb901..beb4d803d 100644 --- a/validate/validate.go +++ b/validate/validate.go @@ -400,6 +400,12 @@ func (v *Validator) CheckOS() (msgs []string) { } } + if v.spec.Platform.OS != "windows" { + if v.spec.Windows != nil { + msgs = append(msgs, fmt.Sprintf("'windows' MUST NOT be set when platform.os is %q", v.spec.Platform.OS)) + } + } + return } From 8543fe4042c1e183a7096148dbde086c1d958ef8 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 11 Apr 2017 09:46:47 +0800 Subject: [PATCH 2/2] Add a function description to checkos Signed-off-by: zhouhao --- validate/validate.go | 1 + 1 file changed, 1 insertion(+) diff --git a/validate/validate.go b/validate/validate.go index beb4d803d..50dd6e9db 100644 --- a/validate/validate.go +++ b/validate/validate.go @@ -385,6 +385,7 @@ func (v *Validator) CheckMounts() (msgs []string) { return } +// CheckOS checks v.spec.Platform.OS func (v *Validator) CheckOS() (msgs []string) { logrus.Debugf("check os")