push: support pushing directly from a bundle file.

This is done by providing a new `--bundle` option.

Signed-off-by: Ian Campbell <ijc@docker.com>

Author: Ian Campbell

internal/commands/push.go

@@ -29,6 +29,7 @@ import (
 type pushOptions struct {
 	registry  registryOptions
 	tag       string
+	bundle    string
 	platforms []string
 }
 
@@ -45,23 +46,46 @@ func pushCmd(dockerCli command.Cli) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	flags.StringVarP(&opts.tag, "tag", "t", "", "Target registry reference (default: <name>:<version> from metadata)")
+	flags.StringVar(&opts.bundle, "bundle", "", "Push a specific bundle")
 	flags.StringSliceVar(&opts.platforms, "platform", nil, "For multi-arch service images, only push the specified platforms")
 	opts.registry.addFlags(flags)
 	return cmd
 }
 
 func runPush(dockerCli command.Cli, name string, opts pushOptions) error {
 	defer muteDockerCli(dockerCli)()
-	app, err := packager.Extract(name)
-	if err != nil {
-		return err
-	}
-	defer app.Cleanup()
-	bndl, err := makeBundleFromApp(dockerCli, app, nil)
-	if err != nil {
-		return err
+
+	var (
+		bndl *bundle.Bundle
+		meta metadata.AppMetadata
+	)
+	if opts.bundle == "" {
+		app, err := packager.Extract(name)
+		if err != nil {
+			return err
+		}
+		defer app.Cleanup()
+		if bndl, err = makeBundleFromApp(dockerCli, app, nil); err != nil {
+			return err
+		}
+		meta = app.Metadata()
+	} else {
+		if name != "" {
+			fmt.Fprintf(os.Stderr, "WARNING: ignoring dockerapp at %q, pushing app directly from %q\n", name, opts.bundle)
+		}
+		r, err := os.Open(opts.bundle)
+		if err != nil {
+			return err
+		}
+		if b, err := bundle.ParseReader(r); err == nil {
+			bndl = &b // TODO: PR to change return type of ParseReader
+		} else {
+			return err
+		}
+		meta = metadata.FromBundle(bndl)
 	}
-	retag, err := shouldRetagInvocationImage(app.Metadata(), bndl, opts.tag)
+
+	retag, err := shouldRetagInvocationImage(meta, bndl, opts.tag)
 	if err != nil {
 		return err
 	}