From 598dd31a7d879844f569ab113f4c157258bcd9e9 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Sun, 2 Apr 2017 12:21:11 +0100
Subject: [PATCH] cli: Don't default to moby.yml

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 src/cmd/moby/build.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/cmd/moby/build.go b/src/cmd/moby/build.go
index 4eacf97d7..b34b2c7b3 100644
--- a/src/cmd/moby/build.go
+++ b/src/cmd/moby/build.go
@@ -19,8 +19,7 @@ import (
 func build(args []string) {
 	buildCmd := flag.NewFlagSet("build", flag.ExitOnError)
 	buildCmd.Usage = func() {
-		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("USAGE: %s build [options] <file.yml>\n\n", os.Args[0])
 		fmt.Printf("Options:\n")
 		buildCmd.PrintDefaults()
 	}
@@ -30,10 +29,12 @@ func build(args []string) {
 	buildCmd.Parse(args)
 	remArgs := buildCmd.Args()
 
-	conf := "moby.yml"
-	if len(remArgs) > 0 {
-		conf = remArgs[0]
+	if len(remArgs) == 0 {
+		fmt.Println("Please specify a configuration file\n")
+		buildCmd.Usage()
+		os.Exit(1)
 	}
+	conf := remArgs[0]
 
 	buildInternal(*buildName, *buildPull, conf)
 }