Update extractImage to support image names without .dockerapp suffix

Signed-off-by: Joffrey F <joffrey@docker.com>

Author: shin-

e2e/commands_test.go

@@ -284,11 +284,9 @@ func testImage(registry string) func(*testing.T) {
 		defer dir.Remove()
 		icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", dir.Join("my.dockerapp")).Assert(t, icmd.Success)
 
-		icmd.RunCommand(dockerApp, "push", "-t", "marshmallows", "--namespace", registry+"/rainbows", "--repo", "unicorns", "render/envvariables").Assert(t, icmd.Success)
-		AssertCommand(t, "docker", "image", "rm", registry+"/rainbows/unicorns:marshmallows")
-		AssertCommandOutput(t, "image-inspect-labels.golden", "docker", "inspect", "-f", "{{.Config.Labels.maintainers}}", registry+"/rainbows/unicorns:marshmallows")
+		// 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)
-		AssertCommand(t, dockerApp, "inspect", registry+"/rainbows/unicorns")
 	}
 }
 

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)
 }