Confusion between content digest and registry digest

+ Code cleanup and a few tests fixed

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

Author: ndeloof

e2e/testdata/bundle-with-tag.json.golden

@@ -16,7 +16,8 @@
 	"invocationImages": [
 		{
 			"imageType": "docker",
-			"image": "myimage:mytag-invoc"
+			"image": "myimage:mytag-invoc",
+			"contentDigest": "sha256:***"
 		}
 	],
 	"images": {

e2e/testdata/plugin-usage-experimental.golden

@@ -10,6 +10,7 @@ Management Commands:
   image       Manage application images
 
 Commands:
+  build       Build service images for the application
   bundle      Create a CNAB invocation image and `bundle.json` for the application
   init        Initialize Docker Application definition
   inspect     Shows metadata, parameters and a summary of the Compose file for a given application

e2e/testdata/plugin-usage.golden

@@ -10,6 +10,7 @@ Management Commands:
   image       Manage application images
 
 Commands:
+  build       Build service images for the application
   bundle      Create a CNAB invocation image and `bundle.json` for the application
   init        Initialize Docker Application definition
   inspect     Shows metadata, parameters and a summary of the Compose file for a given application

e2e/testdata/simple-bundle.json.golden

@@ -16,7 +16,8 @@
 	"invocationImages": [
 		{
 			"imageType": "docker",
-			"image": "simple:1.1.0-beta1-invoc"
+			"image": "simple:1.1.0-beta1-invoc",
+			"contentDigest": "sha256:***"
 		}
 	],
 	"images": {

internal/commands/build.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/docker/app/internal/packager"
+	"github.com/sirupsen/logrus"
 	"os"
 	"path/filepath"
 	"strings"
@@ -13,15 +15,13 @@ import (
 	"github.com/docker/buildx/util/progress"
 
 	cnab "github.com/deislabs/cnab-go/driver"
-	"github.com/docker/app/internal"
 	"github.com/docker/buildx/bake"
 	"github.com/docker/buildx/build"
 	_ "github.com/docker/buildx/driver/docker" // required to get default driver registered, see driver/docker/factory.go:14
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/moby/buildkit/util/appcontext"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -54,25 +54,35 @@ func buildCmd(dockerCli command.Cli) *cobra.Command {
 }
 
 func runBuild(dockerCli command.Cli, application string, opt buildOptions) error {
-	appname := internal.DirNameFromAppName(application)
-	f := "./" + appname + "/" + internal.ComposeFileName
-	if _, err := os.Stat(f); err != nil {
-		if os.IsNotExist(errors.Cause(err)) {
-			return fmt.Errorf("no compose file at %s, did you selected the right docker app folder ?", f)
-		}
+	app, err := packager.Extract(application)
+	if err != nil {
+		return err
 	}
+	defer app.Cleanup()
+	appname := app.Name
 
-	bundle, err := makeBundle(dockerCli, application, nil)
+	bundle, err := makeBundleFromApp(dockerCli, app, nil)
 	if err != nil {
 		return err
 	}
 
 	ctx := appcontext.Context()
-	targets, err := bake.ReadTargets(ctx, []string{f}, []string{"default"}, nil)
+	compose, err := bake.ParseCompose(app.Composes()[0]) // Fixme can have > 1 composes ?
 	if err != nil {
 		return err
 	}
 
+	targets := map[string]bake.Target{}
+	for _, n := range compose.ResolveGroup("default") {
+		t, err := compose.ResolveTarget(n)
+		if err != nil {
+			return nil
+		}
+		if t != nil {
+			targets[n] = *t
+		}
+	}
+
 	for service, t := range targets {
 		if strings.HasPrefix(*t.Context, ".") {
 			// Relative path in compose file under x.dockerapp refers to parent folder
@@ -87,19 +97,35 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) error
 		}
 	}
 
-	// -- debug
-	dt, err := json.MarshalIndent(map[string]map[string]bake.Target{"target": targets}, "", "   ")
-	if err != nil {
-		return err
+	if logrus.IsLevelEnabled(logrus.DebugLevel)	{
+		dt, err := json.MarshalIndent(map[string]map[string]bake.Target{"target": targets}, "", "   ")
+		if err != nil {
+			return err
+		}
+		fmt.Fprintln(dockerCli.Out(), string(dt))
 	}
-	fmt.Fprintln(dockerCli.Out(), string(dt))
-	// -- debug
 
 	buildopts, err := bake.TargetsToBuildOpt(targets, opt.noCache, opt.pull)
 	if err != nil {
 		return err
 	}
 
+	/**
+	// FIXME it seems there's no way to setup a build.Options without a plain DockerContext path
+	buildContext := bytes.NewBuffer(nil)
+	if err := packager.PackInvocationImageContext(dockerCli, app, buildContext); err != nil {
+		return err
+	}
+
+	buildopts["invocation-image"] = build.Options{
+		Inputs:      build.Inputs{
+			InStream: buildContext,
+		},
+		Tags:        []string{ fmt.Sprintf("%s:%s-%s", bundle.Name, bundle.Version, "-invoc") },
+		Session:     []session.Attachable{authprovider.NewDockerAuthProvider(os.Stderr)},
+	}
+	*/
+
 	d, err := driver.GetDriver(ctx, "buildx_buildkit_default", nil, dockerCli.Client(), nil, "", nil)
 	if err != nil {
 		return err
@@ -151,7 +177,7 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) error
 		image := bundle.Images[service]
 		image.ImageType = cnab.ImageTypeDocker
 		image.Image = fmt.Sprintf("%s:%s-%s", bundle.Name, bundle.Version, service)
-		image.Digest = inspect.ID
+		image.Digest = inspect.ID // Content Digest
 		bundle.Images[service] = image
 		fmt.Printf("    - %s : %s:%s-%s (%s)\n", service, bundle.Name, bundle.Version, service, inspect.ID)
 	}

internal/commands/bundle.go

@@ -120,7 +120,13 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App, refOverride refere
 		}
 		return nil, err
 	}
-	return packager.ToCNAB(app, invocationImageName)
+
+	inspect, _, err := dockerCli.Client().ImageInspectWithRaw(context.TODO(), invocationImageName)
+	if err != nil {
+		return nil, err
+	}
+
+	return packager.ToCNAB(app, invocationImageName, inspect.ID)
 }
 
 func makeInvocationImageName(meta metadata.AppMetadata, refOverride reference.NamedTagged) (string, error) {

internal/packager/cnab.go

@@ -17,7 +17,7 @@ const (
 )
 
 // ToCNAB creates a CNAB bundle from an app package
-func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error) {
+func ToCNAB(app *types.App, invocationImageName string, digest string) (*bundle.Bundle, error) {
 	mapping := ExtractCNABParameterMapping(app.Parameters())
 	flatParameters := app.Parameters().Flatten()
 	definitions := definition.Definitions{
@@ -160,6 +160,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 				BaseImage: bundle.BaseImage{
 					Image:     invocationImageName,
 					ImageType: "docker",
+					Digest: digest,
 				},
 			},
 		},

internal/packager/cnab_test.go

@@ -13,7 +13,7 @@ import (
 func TestToCNAB(t *testing.T) {
 	app, err := types.NewAppFromDefaultFiles("testdata/packages/packing.dockerapp")
 	assert.NilError(t, err)
-	actual, err := ToCNAB(app, "test-image")
+	actual, err := ToCNAB(app, "test-image", "")
 	assert.NilError(t, err)
 	actualJSON, err := json.MarshalIndent(actual, "", "  ")
 	assert.NilError(t, err)