From 397c4332f20c48e85d4f6fa400231fa8021c5801 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 2 Apr 2017 12:25:28 +0100 Subject: [PATCH] cli: Make the ".yml" extension optional for builds This provides a consistent UX between build and run: moby build foo # build from foo.yml moby run foo # boot, e.g., foo-bzImage, foo-initrd.img Signed-off-by: Rolf Neugebauer --- src/cmd/moby/build.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cmd/moby/build.go b/src/cmd/moby/build.go index b34b2c7b3..5fffb34f6 100644 --- a/src/cmd/moby/build.go +++ b/src/cmd/moby/build.go @@ -19,7 +19,7 @@ import ( func build(args []string) { buildCmd := flag.NewFlagSet("build", flag.ExitOnError) buildCmd.Usage = func() { - fmt.Printf("USAGE: %s build [options] \n\n", os.Args[0]) + fmt.Printf("USAGE: %s build [options] [.yml]\n\n", os.Args[0]) fmt.Printf("Options:\n") buildCmd.PrintDefaults() } @@ -35,6 +35,9 @@ func build(args []string) { os.Exit(1) } conf := remArgs[0] + if filepath.Ext(conf) == "" { + conf = conf + ".yml" + } buildInternal(*buildName, *buildPull, conf) }