Merge pull request #1082 from smarterclayton/incorrect_manifest_validation

Incorrect validation error for container image
This commit is contained in:
brendandburns 2014-08-28 09:32:29 -07:00
commit b743c3de77

View File

@ -195,7 +195,7 @@ func validateContainers(containers []Container, volumes util.StringSet) errs.Err
allNames.Insert(ctr.Name) allNames.Insert(ctr.Name)
} }
if len(ctr.Image) == 0 { if len(ctr.Image) == 0 {
cErrs = append(cErrs, errs.NewInvalid("image", ctr.Name)) cErrs = append(cErrs, errs.NewRequired("image", ctr.Image))
} }
cErrs = append(cErrs, validatePorts(ctr.Ports).Prefix("ports")...) cErrs = append(cErrs, validatePorts(ctr.Ports).Prefix("ports")...)
cErrs = append(cErrs, validateEnv(ctr.Env).Prefix("env")...) cErrs = append(cErrs, validateEnv(ctr.Env).Prefix("env")...)