github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

cli: Don't default to moby.yml

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-04-02 12:21:11 +01:00
parent bfbac93ef3
commit 838e4814e4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cmd/moby/build.go
View File

@ -19,8 +19,7 @@ import (
func build(args []string) { func build(args []string) {
buildCmd := flag.NewFlagSet("build", flag.ExitOnError) buildCmd := flag.NewFlagSet("build", flag.ExitOnError)
buildCmd.Usage = func() { buildCmd.Usage = func() {
fmt.Printf("USAGE: %s build [options] [file.yml]\n\n", os.Args[0]) fmt.Printf("USAGE: %s build [options] <file.yml>\n\n", os.Args[0])
fmt.Printf("'file.yml' defaults to 'moby.yml' if not specified.\n\n")
fmt.Printf("Options:\n") fmt.Printf("Options:\n")
buildCmd.PrintDefaults() buildCmd.PrintDefaults()
} }
@ -30,10 +29,12 @@ func build(args []string) {
buildCmd.Parse(args) buildCmd.Parse(args)
remArgs := buildCmd.Args() remArgs := buildCmd.Args()
conf := "moby.yml" if len(remArgs) == 0 {
if len(remArgs) > 0 { fmt.Println("Please specify a configuration file\n")
conf = remArgs[0] buildCmd.Usage()
os.Exit(1)
} }
conf := remArgs[0]
buildInternal(*buildName, *buildPull, conf) buildInternal(*buildName, *buildPull, conf)
} }