New init path misses scenario where user *will* create a Dockerfile

Fixes #209

cmd/init.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"path"
 	"strconv"
 
 	"github.com/superfly/flyctl/cmdctx"
@@ -47,6 +48,12 @@ func newInitCommand() *Command {
 		Description: `The Cloud Native Buildpacks builder to use when deploying the app`,
 	})
 
+	cmd.AddBoolFlag(BoolFlagOpts{
+		Name:        "dockerfile",
+		Description: `Use a dockerfile when deploying the app`,
+		Default:     false,
+	})
+
 	return cmd
 }
 
@@ -121,9 +128,12 @@ func runInit(commandContext *cmdctx.CmdContext) error {
 
 	fmt.Println()
 
-	if builder, _ := commandContext.Config.GetString("builder"); builder != "" {
-		newAppConfig.Build = &flyctl.Build{Builder: builder}
-	} else {
+	dockerfile := commandContext.Config.GetBool("dockerfile")
+	dockerfileset := commandContext.Config.IsSet("dockerfile")
+	builder, _ := commandContext.Config.GetString("builder")
+
+	// If no builder has been set and no dockerfile setting - ask
+	if builder == "" && !dockerfileset {
 		builder, err := selectBuildtype(commandContext)
 
 		switch {
@@ -132,16 +142,31 @@ func runInit(commandContext *cmdctx.CmdContext) error {
 		case err != nil || org == nil:
 			return fmt.Errorf("Error setting builder: %s", err)
 		}
-
 		if builder != "Dockerfile" {
 			newAppConfig.Build = &flyctl.Build{Builder: builder}
+		} else {
+			dockerfileExists := helpers.FileExists(path.Join(commandContext.WorkingDir, "Dockerfile"))
+			if !dockerfileExists {
+				newdf, err := os.Create(path.Join(commandContext.WorkingDir, "Dockerfile"))
+				if err != nil {
+					return fmt.Errorf("Error writing example Dockerfile: %s", err)
+				}
+				fmt.Fprintf(newdf, "FROM flydotio/getting-started\n\nEXPOSE 8080\n")
+				newdf.Close()
+			}
+		}
+	} else if builder != "" {
+		// If the builder was set and there's not dockerfile setting, write the builder
+		if !dockerfile {
+			newAppConfig.Build = &flyctl.Build{Builder: builder}
 		}
 	}
 
 	app, err := commandContext.Client.API().CreateApp(name, org.ID)
 	if err != nil {
 		return err
 	}
+
 	newAppConfig.AppName = app.Name
 	newAppConfig.Definition = app.Config.Definition
 

cmd/input.go

@@ -106,6 +106,8 @@ func selectBuildtype(commandContext *cmdctx.CmdContext) (string, error) {
 
 	if dockerfileExists {
 		builders = append(builders, fmt.Sprintf("%s (%s)", "Dockerfile", "Use the existing Dockerfile"))
+	} else {
+		builders = append(builders, fmt.Sprintf("%s (%s)", "Dockerfile", "Create a example Dockerfile"))
 	}
 
 	for _, b := range suggestedBuilders {
@@ -123,14 +125,10 @@ func selectBuildtype(commandContext *cmdctx.CmdContext) (string, error) {
 		return "", err
 	}
 
-	if dockerfileExists {
-		if selectedBuilder == 0 {
-			return "Dockerfile", nil
-		}
-		return suggestedBuilders[selectedBuilder-1].Image, nil
+	if selectedBuilder == 0 {
+		return "Dockerfile", nil
 	}
-
-	return suggestedBuilders[selectedBuilder].Image, nil
+	return suggestedBuilders[selectedBuilder-1].Image, nil
 }
 
 func confirmFileOverwrite(filename string) bool {