github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 09:09:57 +00:00
Code Issues Projects Releases Wiki Activity

cli: Make the ".yml" extension optional for builds

Browse Source 
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 <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer
2017-04-02 12:25:28 +01:00
parent 838e4814e4
commit eda4c14aa6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +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("Options:\n") fmt.Printf("Options:\n")
buildCmd.PrintDefaults() buildCmd.PrintDefaults()
} }
@@ -35,6 +35,9 @@ func build(args []string) {
os.Exit(1) os.Exit(1)
} }
conf := remArgs[0] conf := remArgs[0]
if filepath.Ext(conf) == "" {
conf = conf + ".yml"
}
buildInternal(*buildName, *buildPull, conf) buildInternal(*buildName, *buildPull, conf)
} }