add no-cache and build-target flags to build command, hidden for now

cmd/command.go

@@ -51,6 +51,7 @@ type StringFlagOpts struct {
 	Description string
 	Default     string
 	EnvName     string
+	Hidden      bool
 }
 
 // BoolFlagOpts - options for boolean flags
@@ -68,7 +69,9 @@ func (c *Command) AddStringFlag(options StringFlagOpts) {
 	fullName := namespace(c.Command) + "." + options.Name
 	c.Flags().StringP(options.Name, options.Shorthand, options.Default, options.Description)
 
-	err := viper.BindPFlag(fullName, c.Flags().Lookup(options.Name))
+	flag := c.Flags().Lookup(options.Name)
+	flag.Hidden = options.Hidden
+	err := viper.BindPFlag(fullName, flag)
 	checkErr(err)
 
 	if options.EnvName != "" {

cmd/deploy.go

@@ -75,6 +75,16 @@ func newDeployCommand(client *client.Client) *Command {
 		Name:        "image-label",
 		Description: "Image label to use when tagging and pushing to the fly registry. Defaults to \"deployment-{timestamp}\".",
 	})
+	cmd.AddStringFlag(StringFlagOpts{
+		Name:        "build-target",
+		Description: "Set the target build stage to build if the Dockerfile has more than one stage",
+		Hidden:      true,
+	})
+	cmd.AddBoolFlag(BoolFlagOpts{
+		Name:        "no-cache",
+		Description: "Do not use the cache when building the image",
+		Hidden:      true,
+	})
 
 	cmd.Command.Args = cobra.MaximumNArgs(1)
 
@@ -152,6 +162,8 @@ func runDeploy(cmdCtx *cmdctx.CmdContext) error {
 			AppConfig:  cmdCtx.AppConfig,
 			Publish:    !cmdCtx.Config.GetBool("build-only"),
 			ImageLabel: cmdCtx.Config.GetString("image-label"),
+			Target:     cmdCtx.Config.GetString("build-target"),
+			NoCache:    cmdCtx.Config.GetBool("no-cache"),
 		}
 		if dockerfilePath := cmdCtx.Config.GetString("dockerfile"); dockerfilePath != "" {
 			dockerfilePath, err := filepath.Abs(dockerfilePath)

internal/build/imgsrc/dockerfile_builder.go

@@ -168,12 +168,13 @@ func normalizeBuildArgsForDocker(appConfig *flyctl.AppConfig, extra map[string]s
 
 func runClassicBuild(ctx context.Context, streams *iostreams.IOStreams, docker *dockerclient.Client, r io.ReadCloser, opts ImageOptions, dockerfilePath string, buildArgs map[string]*string) (imageID string, err error) {
 	options := types.ImageBuildOptions{
-		Tags:      []string{opts.Tag},
-		BuildArgs: buildArgs,
-		// NoCache:   true,
+		Tags:        []string{opts.Tag},
+		BuildArgs:   buildArgs,
 		AuthConfigs: authConfigs(),
 		Platform:    "linux/amd64",
 		Dockerfile:  dockerfilePath,
+		Target:      opts.Target,
+		NoCache:     opts.NoCache,
 	}
 
 	resp, err := docker.ImageBuild(ctx, r, options)
@@ -246,6 +247,8 @@ func runBuildKitBuild(ctx context.Context, streams *iostreams.IOStreams, docker
 			BuildID:       buildID,
 			Platform:      "linux/amd64",
 			Dockerfile:    dockerfilePath,
+			Target:        opts.Target,
+			NoCache:       opts.NoCache,
 		}
 
 		return func() error {

internal/build/imgsrc/resolver.go

@@ -21,6 +21,8 @@ type ImageOptions struct {
 	ImageLabel     string
 	Publish        bool
 	Tag            string
+	Target         string
+	NoCache        bool
 }
 
 type RefOptions struct {