github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Validate output before doing the work

Browse Source 
Signed-off-by: French Ben <frenchben@docker.com>
This commit is contained in:
French Ben 2017-06-01 14:30:41 -07:00
parent dec7f8bb2b
commit 23856c1e46
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/moby/build.go
View File

@ -65,6 +65,13 @@ func build(args []string) {
log.Debugf("Outputs selected: %s", buildOut.String()) log.Debugf("Outputs selected: %s", buildOut.String())
err := validateOutputs(buildOut)
if err != nil {
log.Errorf("Error parsing outputs: %v", err)
buildCmd.Usage()
os.Exit(1)
}
if len(remArgs) == 0 { if len(remArgs) == 0 {
fmt.Println("Please specify a configuration file") fmt.Println("Please specify a configuration file")
buildCmd.Usage() buildCmd.Usage()

20
cmd/moby/output.go
View File

@ -119,15 +119,29 @@ var outFuns = map[string]func(string, []byte) error{
}, },
} }
func outputs(base string, image []byte, out outputList) error { func validateOutputs(out outputList) error {
log.Debugf("output: %v %s", out, base) log.Debugf("validating output: %v", out)
for _, o := range out { for _, o := range out {
f := outFuns[o] f := outFuns[o]
if f == nil { if f == nil {
return fmt.Errorf("Unknown output type %s", o) return fmt.Errorf("Unknown output type %s", o)
} }
err := f(base, image) }
return nil
}
func outputs(base string, image []byte, out outputList) error {
log.Debugf("output: %v %s", out, base)
err := validateOutputs(out)
if err != nil {
return err
}
for _, o := range out {
f := outFuns[o]
err = f(base, image)
if err != nil { if err != nil {
return err return err
} }