Merge pull request #362 from vdemeester/358-fix-image-app-name

Fix the application name when extracting a docker image

Author: vdemeester

internal/packager/extract.go

@@ -11,6 +11,7 @@ import (
 	"github.com/docker/app/internal"
 	"github.com/docker/app/loader"
 	"github.com/docker/app/types"
+	"github.com/docker/distribution/reference"
 	"github.com/pkg/errors"
 )
 
@@ -42,20 +43,29 @@ func findApp() (string, error) {
 	return filepath.Join(cwd, hit), nil
 }
 
+func appNameFromRef(ref reference.Named) string {
+	parts := strings.Split(ref.Name(), "/")
+	return internal.DirNameFromAppName(parts[len(parts)-1])
+}
+
+func imageNameFromRef(ref reference.Named) string {
+	if tagged, ok := ref.(reference.Tagged); ok {
+		name := internal.DirNameFromAppName(ref.Name())
+		newRef, _ := reference.WithName(name)
+		newtaggedRef, _ := reference.WithTag(newRef, tagged.Tag())
+		return newtaggedRef.String()
+	}
+	return internal.DirNameFromAppName(ref.String())
+}
+
 // extractImage extracts a docker application in a docker image to a temporary directory
 func extractImage(appname string, ops ...func(*types.App) error) (*types.App, error) {
-	var imagename string
-	if strings.Contains(appname, ":") {
-		nametag := strings.Split(appname, ":")
-		if len(nametag) == 3 || strings.Contains(nametag[1], "/") {
-			nametag[1] = internal.DirNameFromAppName(nametag[1])
-		} else {
-			nametag[0] = internal.DirNameFromAppName(nametag[0])
-		}
-		imagename = strings.Join(nametag, ":")
-	} else {
-		imagename = internal.DirNameFromAppName(appname)
+	ref, err := reference.ParseNormalizedNamed(appname)
+	if err != nil {
+		return nil, err
 	}
+	imagename := imageNameFromRef(ref)
+	appname = appNameFromRef(ref)
 	tempDir, err := ioutil.TempDir("", "dockerapp")
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create temporary directory")
@@ -65,8 +75,8 @@ func extractImage(appname string, ops ...func(*types.App) error) (*types.App, er
 		os.RemoveAll(tempDir)
 		return nil, err
 	}
-	ops = append(ops, types.WithCleanup(func() { os.RemoveAll(tempDir) }))
-	return Extract(path, ops...)
+	ops = append(ops, types.WithName(appname), types.WithCleanup(func() { os.RemoveAll(tempDir) }))
+	return loader.LoadFromDirectory(path, ops...)
 }
 
 // Extract extracts the app content if argument is an archive, or does nothing if a dir.

internal/packager/extract_test.go

@@ -0,0 +1,36 @@
+package packager
+
+import (
+	"testing"
+
+	"github.com/docker/distribution/reference"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+)
+
+func TestImageAppNameFromRef(t *testing.T) {
+	refs := []struct {
+		ref       string
+		appName   string
+		imageName string
+	}{
+		{ref: "foo", appName: "foo.dockerapp", imageName: "docker.io/library/foo.dockerapp"},
+		{ref: "foo.dockerapp", appName: "foo.dockerapp", imageName: "docker.io/library/foo.dockerapp"},
+		{ref: "foo:0.2.0", appName: "foo.dockerapp", imageName: "docker.io/library/foo.dockerapp:0.2.0"},
+		{ref: "foo.dockerapp:0.2.0", appName: "foo.dockerapp", imageName: "docker.io/library/foo.dockerapp:0.2.0"},
+		{ref: "namespace/foo", appName: "foo.dockerapp", imageName: "docker.io/namespace/foo.dockerapp"},
+		{ref: "namespace/bar.dockerapp", appName: "bar.dockerapp", imageName: "docker.io/namespace/bar.dockerapp"},
+		{ref: "namespace/bar:0.2.0", appName: "bar.dockerapp", imageName: "docker.io/namespace/bar.dockerapp:0.2.0"},
+		{ref: "namespace/bar.dockerapp:0.2.0", appName: "bar.dockerapp", imageName: "docker.io/namespace/bar.dockerapp:0.2.0"},
+		{ref: "gcr.io/namespace/baz", appName: "baz.dockerapp", imageName: "gcr.io/namespace/baz.dockerapp"},
+		{ref: "gcr.io/namespace/baz.dockerapp", appName: "baz.dockerapp", imageName: "gcr.io/namespace/baz.dockerapp"},
+		{ref: "gcr.io/namespace/baz:0.2.0", appName: "baz.dockerapp", imageName: "gcr.io/namespace/baz.dockerapp:0.2.0"},
+		{ref: "gcr.io/namespace/baz.dockerapp:0.2.0", appName: "baz.dockerapp", imageName: "gcr.io/namespace/baz.dockerapp:0.2.0"},
+	}
+	for _, r := range refs {
+		ref, err := reference.ParseNormalizedNamed(r.ref)
+		assert.NilError(t, err)
+		assert.Assert(t, is.Equal(imageNameFromRef(ref), r.imageName))
+		assert.Assert(t, is.Equal(appNameFromRef(ref), r.appName))
+	}
+}