Merge pull request #355 from shin-/360-customizable_target_repo_save_push

Allow user to configure repo name with save and push commands

Author: shin-

cmd/docker-app/push.go

@@ -11,6 +11,7 @@ import (
 type pushOptions struct {
 	namespace string
 	tag       string
+	repo      string
 }
 
 func pushCmd() *cobra.Command {
@@ -25,7 +26,7 @@ func pushCmd() *cobra.Command {
 				return err
 			}
 			defer app.Cleanup()
-			dgst, err := packager.Push(app, opts.namespace, opts.tag)
+			dgst, err := packager.Push(app, opts.namespace, opts.tag, opts.repo)
 			if err == nil {
 				fmt.Println(dgst)
 			}
@@ -34,5 +35,6 @@ func pushCmd() *cobra.Command {
 	}
 	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")
 	cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Tag to use (default: version in metadata)")
+	cmd.Flags().StringVar(&opts.repo, "repo", "", "Name of the remote repository (default: <app-name>.dockerapp)")
 	return cmd
 }

e2e/commands_test.go

@@ -282,6 +282,10 @@ func testImage(registry string) func(*testing.T) {
 		dir := fs.NewDir(t, "save-prepare-build", fs.WithFile("my.dockerapp", singleFileApp))
 		defer dir.Remove()
 		icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", dir.Join("my.dockerapp")).Assert(t, icmd.Success)
+
+		// push with custom repo name
+		icmd.RunCommand(dockerApp, "push", "-t", "marshmallows", "--namespace", registry+"/rainbows", "--repo", "unicorns", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
+		icmd.RunCommand(dockerApp, "inspect", registry+"/rainbows/unicorns:marshmallows").Assert(t, icmd.Success)
 	}
 }
 

internal/packager/extract.go

@@ -64,16 +64,26 @@ func extractImage(appname string, ops ...func(*types.App) error) (*types.App, er
 	if err != nil {
 		return nil, err
 	}
+	literalImageName := appname
 	imagename := imageNameFromRef(ref)
 	appname = appNameFromRef(ref)
 	tempDir, err := ioutil.TempDir("", "dockerapp")
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create temporary directory")
 	}
+	// Attempt loading image based on default name permutation
 	path, err := Pull(imagename, tempDir)
 	if err != nil {
-		os.RemoveAll(tempDir)
-		return nil, err
+		if literalImageName == imagename {
+			os.RemoveAll(tempDir)
+			return nil, err
+		}
+		// Attempt loading image based on the literal name
+		path, err = Pull(literalImageName, tempDir)
+		if err != nil {
+			os.RemoveAll(tempDir)
+			return nil, err
+		}
 	}
 	ops = append(ops, types.WithName(appname), types.WithCleanup(func() { os.RemoveAll(tempDir) }))
 	return loader.LoadFromDirectory(path, ops...)

internal/packager/registry.go

@@ -66,7 +66,7 @@ func Pull(repotag string, outputDir string) (string, error) {
 }
 
 // Push pushes an app to a registry. Returns the image digest.
-func Push(app *types.App, namespace, tag string) (string, error) {
+func Push(app *types.App, namespace, tag, repo string) (string, error) {
 	payload := make(map[string]string)
 	payload[internal.MetadataFileName] = string(app.MetadataRaw())
 	payload[internal.ComposeFileName] = string(app.Composes()[0])
@@ -80,9 +80,12 @@ func Push(app *types.App, namespace, tag string) (string, error) {
 			tag = metadata.Version
 		}
 	}
+	if repo == "" {
+		repo = internal.AppNameFromDir(app.Name) + internal.AppExtension
+	}
 	if namespace != "" && namespace[len(namespace)-1] != '/' {
 		namespace += "/"
 	}
-	imageName := namespace + internal.AppNameFromDir(app.Name) + internal.AppExtension + ":" + tag
+	imageName := namespace + repo + ":" + tag
 	return resto.PushConfigMulti(context.Background(), payload, imageName, resto.RegistryOptions{}, nil)
 }