Fix pushing a pre-bundled app from the bundle store shouldn't require an explicit tag.

The push was using the default value (app name + version) as a repo and tag, fixed using the bundle reference.

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>

Author: silvin-lubecki

e2e/pushpull_test.go

@@ -269,6 +269,27 @@ func TestPushInstallBundle(t *testing.T) {
 			cmd.Command = dockerCli.Command("service", "ls")
 			assert.Check(t, cmp.Contains(icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined(), ref2))
 		})
+
+		// push it again using an app pre-bundled and tagged in the bundle store and install it to check it is also available
+		t.Run("push-bundleref", func(t *testing.T) {
+			name := strings.Replace(t.Name(), "/", "_", 1)
+			ref2 := ref + ":v0.42"
+			// Create a new command so the bundle store can be trashed before installing the app
+			cmd2, cleanup2 := dockerCli.createTestCmd()
+			// bundle the app again but this time with a tag to store it into the bundle store
+			cmd2.Command = dockerCli.Command("app", "bundle", "--tag", ref2, "-o", bundleFile, filepath.Join("testdata", "push-pull", "push-pull.dockerapp"))
+			icmd.RunCmd(cmd2).Assert(t, icmd.Success)
+			// Push the app without tagging it explicitly
+			cmd2.Command = dockerCli.Command("app", "push", "--insecure-registries="+info.registryAddress, ref2)
+			icmd.RunCmd(cmd2).Assert(t, icmd.Success)
+			// remove the bundle from the bundle store to be sure it won't be used instead of registry
+			cleanup2()
+			// install from the registry
+			cmd.Command = dockerCli.Command("app", "install", "--insecure-registries="+info.registryAddress, ref2, "--name", name)
+			icmd.RunCmd(cmd).Assert(t, icmd.Success)
+			cmd.Command = dockerCli.Command("service", "ls")
+			assert.Check(t, cmp.Contains(icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined(), ref))
+		})
 	})
 }
 

internal/commands/cnab.go

@@ -251,6 +251,9 @@ func extractAndLoadAppBasedBundle(dockerCli command.Cli, name string) (*bundle.B
 	return bndl, "", err
 }
 
+//resolveBundle looks for a CNAB bundle which can be in a Docker App Package format or
+// a bundle stored locally or in the bundle store. It returns a built or found bundle,
+// a reference to the bundle if it is found in the bundlestore, and an error.
 func resolveBundle(dockerCli command.Cli, bundleStore appstore.BundleStore, name string, pullRef bool, insecureRegistries []string) (*bundle.Bundle, string, error) {
 	// resolution logic:
 	// - if there is a docker-app package in working directory, or an http:// / https:// prefix, use packager.Extract result

internal/commands/push.go

@@ -78,10 +78,14 @@ func runPush(dockerCli command.Cli, name string, opts pushOptions) error {
 		return err
 	}
 
-	bndl, _, err := resolveBundle(dockerCli, bundleStore, name, false, nil)
+	bndl, ref, err := resolveBundle(dockerCli, bundleStore, name, false, nil)
 	if err != nil {
 		return err
 	}
+	// Use the bundle reference as a tag
+	if ref != "" && opts.tag == "" {
+		opts.tag = ref
+	}
 	if err := bndl.Validate(); err != nil {
 		return err
 	}