tag services images according to compose file image attribute

use docker-compose `Image` attribute if set
use {tag}-{service} if user has specified a tag with --tag
never tag the invocation image

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

Author: ndeloof

internal/commands/build/build.go

@@ -88,24 +88,12 @@ func runBuild(dockerCli command.Cli, contextPath string, opt buildOptions) (refe
 	}
 	defer app.Cleanup()
 
-	serviceTag := ref
-	if serviceTag == nil {
-		named, err := reference.WithName(app.Metadata().Name)
-		if err != nil {
-			return nil, err
-		}
-		serviceTag, err = reference.WithTag(named, app.Metadata().Version)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	buildopts, err := parseCompose(app, contextPath, opt, serviceTag)
+	buildopts, err := parseCompose(app, contextPath, opt)
 	if err != nil {
 		return nil, err
 	}
 
-	buildopts["com.docker.app.invocation-image"], err = createInvocationImageBuildOptions(dockerCli, app, serviceTag)
+	buildopts["com.docker.app.invocation-image"], err = createInvocationImageBuildOptions(dockerCli, app)
 	if err != nil {
 		return nil, err
 	}
@@ -160,6 +148,9 @@ func getAppFolder(opt buildOptions, contextPath string) (string, error) {
 					return "", fmt.Errorf("%s contains multiple *.dockerapp folders, use -f option to select the one to build", contextPath)
 				}
 				application = filepath.Join(contextPath, f.Name())
+				if !f.IsDir() {
+					return "", fmt.Errorf("%s isn't a directory", f.Name())
+				}
 			}
 		}
 	}
@@ -205,7 +196,7 @@ func updateBundle(dockerCli command.Cli, bundle *bundle.Bundle, resp map[string]
 	return nil
 }
 
-func createInvocationImageBuildOptions(dockerCli command.Cli, app *types.App, serviceTag reference.Reference) (build.Options, error) {
+func createInvocationImageBuildOptions(dockerCli command.Cli, app *types.App) (build.Options, error) {
 	buildContext := bytes.NewBuffer(nil)
 	if err := packager.PackInvocationImageContext(dockerCli, app, buildContext); err != nil {
 		return build.Options{}, err
@@ -216,7 +207,6 @@ func createInvocationImageBuildOptions(dockerCli command.Cli, app *types.App, se
 			ContextPath: "-",
 		},
 		Session: []session.Attachable{authprovider.NewDockerAuthProvider(os.Stderr)},
-		Tags:    []string{fmt.Sprintf("%s-installer", serviceTag.String())},
 	}, nil
 }
 

internal/commands/build/compose.go

@@ -1,12 +1,9 @@
 package build
 
 import (
-	"errors"
 	"fmt"
 	"path"
 
-	"github.com/docker/distribution/reference"
-
 	"github.com/docker/app/types"
 	"github.com/docker/buildx/build"
 	"github.com/docker/cli/cli/compose/loader"
@@ -15,7 +12,7 @@ import (
 
 // parseCompose do parse app compose file and extract buildx Options
 // We don't rely on bake's ReadTargets + TargetsToBuildOpt here as we have to skip environment variable interpolation
-func parseCompose(app *types.App, contextPath string, options buildOptions, reference reference.Reference) (map[string]build.Options, error) {
+func parseCompose(app *types.App, contextPath string, options buildOptions) (map[string]build.Options, error) {
 	parsed, err := loader.ParseYAML(app.Composes()[0])
 	if err != nil {
 		return nil, err
@@ -31,13 +28,11 @@ func parseCompose(app *types.App, contextPath string, options buildOptions, refe
 		if service.Build == nil {
 			continue
 		}
-
-		if service.Name == "installer" {
-			return nil, errors.New("'installer' is a reserved service name, please fix your docker-compose.yml file")
+		var tags []string
+		if service.Image != nil {
+			tags = append(tags, *service.Image)
 		}
 
-		tags := []string{fmt.Sprintf("%s-%s", reference.String(), service.Name)}
-
 		if service.Build.Dockerfile == "" {
 			service.Build.Dockerfile = "Dockerfile"
 		}

internal/commands/build/compose_test.go

@@ -3,18 +3,12 @@ package build
 import (
 	"testing"
 
-	"github.com/docker/distribution/reference"
-
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/buildx/build"
 	"gotest.tools/assert"
 )
 
 func Test_parseCompose(t *testing.T) {
-
-	tag, err := reference.Parse("test:1.0")
-	assert.NilError(t, err)
-
 	tests := []struct {
 		name    string
 		service string
@@ -28,7 +22,7 @@ func Test_parseCompose(t *testing.T) {
 					ContextPath:    "testdata/web",
 					DockerfilePath: "testdata/web/Dockerfile",
 				},
-				Tags: []string{"test:1.0-web"},
+				Tags: []string{"frontend"},
 			},
 		},
 		{
@@ -39,7 +33,6 @@ func Test_parseCompose(t *testing.T) {
 					ContextPath:    "testdata/web",
 					DockerfilePath: "testdata/web/Dockerfile.custom",
 				},
-				Tags: []string{"test:1.0-web"},
 			},
 		},
 		{
@@ -51,15 +44,14 @@ func Test_parseCompose(t *testing.T) {
 					DockerfilePath: "testdata/web/Dockerfile",
 				},
 				BuildArgs: map[string]string{"foo": "bar"},
-				Tags:      []string{"test:1.0-web"},
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			app, err := packager.Extract("testdata/" + tt.name)
 			assert.NilError(t, err)
-			got, err := parseCompose(app, "testdata", buildOptions{}, tag)
+			got, err := parseCompose(app, "testdata", buildOptions{})
 			assert.NilError(t, err)
 			_, ok := got["dontwant"]
 			assert.Assert(t, !ok, "parseCompose() should have excluded 'dontwant' service")

internal/packager/extract.go

@@ -14,7 +14,7 @@ import (
 )
 
 // findApp looks for an app in CWD or subdirs
-func FindApp(cwd string) (string, error) {
+func findApp(cwd string) (string, error) {
 	if strings.HasSuffix(cwd, internal.AppExtension) {
 		return cwd, nil
 	}
@@ -47,7 +47,7 @@ func Extract(name string, ops ...func(*types.App) error) (*types.App, error) {
 		if err != nil {
 			return nil, errors.Wrap(err, "cannot resolve current working directory")
 		}
-		if name, err = FindApp(cwd); err != nil {
+		if name, err = findApp(cwd); err != nil {
 			return nil, err
 		}
 	}