Include fixes by buildx team

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

Author: ndeloof

Gopkg.lock

@@ -23,7 +23,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[constraint]]
   name = "github.com/docker/buildx"
-  version = "=v0.3.0"
+  revision = "96fb17b71125d4a11c904bd8a4298bac3b9e11e9"
 
 [[override]]
   name = "github.com/moby/buildkit"

Gopkg.toml

@@ -1,10 +1,13 @@
 package commands
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"github.com/docker/app/internal/packager"
+	"github.com/moby/buildkit/session"
+	"github.com/moby/buildkit/session/auth/authprovider"
 	"github.com/sirupsen/logrus"
 	"os"
 	"path/filepath"
@@ -102,16 +105,14 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) error
 		if err != nil {
 			return err
 		}
-		fmt.Fprintln(dockerCli.Out(), string(dt))
+		logrus.Debug(string(dt))
 	}
 
 	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
@@ -120,11 +121,11 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) error
 	buildopts["invocation-image"] = build.Options{
 		Inputs:      build.Inputs{
 			InStream: buildContext,
+			ContextPath: "-",
 		},
 		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 {
@@ -140,49 +141,36 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) error
 	ctx2, cancel := context.WithCancel(context.TODO())
 	defer cancel()
 
-	// FIXME add invocation image as another build target
-
 	pw := progress.NewPrinter(ctx2, os.Stderr, opt.progress)
-	_, err = build.Build(ctx2, driverInfo, buildopts, dockerAPI(dockerCli), dockerCli.ConfigFile(), pw)
+	resp, err := build.Build(ctx2, driverInfo, buildopts, dockerAPI(dockerCli), dockerCli.ConfigFile(), pw)
 	if err != nil {
 		return err
 	}
 
 	fmt.Println("Successfully built service images")
 
-	/* FIXME Build should tell us everything we need to know about digests https://github.com/docker/buildx/issues/149
 	for service, r := range resp {
 		digest := r.ExporterResponse["containerimage.digest"]
-		image := bundle.Images[service]
-		image.ImageType = cnab.ImageTypeDocker
-		image.Image = fmt.Sprintf("%s@%s", bundle.Name, digest)
-		bundle.Images[service] = image
-		fmt.Printf("    - %s : %s\n", service, image.Digest)
-	}
-	// -- debug
-	dt, err = json.MarshalIndent(resp, "", "   ")
-	if err != nil {
-		return err
+		if service == "invocation-image" {
+			bundle.InvocationImages[0].Digest = digest
+		} else {
+			image := bundle.Images[service]
+			image.Image = fmt.Sprintf("%s:%s-%s", bundle.Name, bundle.Version, service)
+			image.ImageType = cnab.ImageTypeDocker
+			image.Digest = digest
+			bundle.Images[service] = image
+		}
+		fmt.Printf("    - %s : %s\n", service, digest)
 	}
-	fmt.Fprintln(dockerCli.Out(), string(dt))
-	// -- debug
-    */
-	// FIXME as a workaround, inspect image we've just built to get digest
-	for service, _ := range targets {
-		ref := fmt.Sprintf("%s:%s-%s", bundle.Name, bundle.Version, service)
-		inspect, _, err := dockerCli.Client().ImageInspectWithRaw(ctx, ref)
+
+	if logrus.IsLevelEnabled(logrus.DebugLevel) {
+		dt, err := json.MarshalIndent(resp, "", "   ")
 		if err != nil {
 			return err
 		}
-		image := bundle.Images[service]
-		image.ImageType = cnab.ImageTypeDocker
-		image.Image = fmt.Sprintf("%s:%s-%s", bundle.Name, bundle.Version, service)
-		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)
+		logrus.Debug(string(dt))
 	}
 
-
 	if opt.tag == "" {
 		opt.tag = bundle.Name + ":" + bundle.Version
 	}

internal/commands/build.go

@@ -1,8 +1,6 @@
 package commands
 
 import (
-	"bytes"
-	"context"
 	"fmt"
 	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal/packager"
@@ -12,11 +10,8 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/config"
 	"github.com/docker/distribution/reference"
-	dockertypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"io/ioutil"
 )
 
 func makeBundleFromApp(dockerCli command.Cli, app *types.App, refOverride reference.NamedTagged) (*bundle.Bundle, error) {
@@ -27,38 +22,7 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App, refOverride refere
 		return nil, err
 	}
 
-	buildContext := bytes.NewBuffer(nil)
-	if err := packager.PackInvocationImageContext(dockerCli, app, buildContext); err != nil {
-		return nil, err
-	}
-
-	// TODO This should be managed by buildx at same time we build service images
-	logrus.Debugf("Building invocation image %s", invocationImageName)
-	buildResp, err := dockerCli.Client().ImageBuild(context.TODO(), buildContext, dockertypes.ImageBuildOptions{
-		Dockerfile: "Dockerfile",
-		Tags:       []string{invocationImageName},
-		BuildArgs:  map[string]*string{},
-	})
-	if err != nil {
-		return nil, err
-	}
-	defer buildResp.Body.Close()
-
-	if err := jsonmessage.DisplayJSONMessagesStream(buildResp.Body, ioutil.Discard, 0, false, func(jsonmessage.JSONMessage) {}); err != nil {
-		// If the invocation image can't be found we will get an error of the form:
-		// manifest for docker/cnab-app-base:v0.6.0-202-gbaf0b246c7 not found
-		if err.Error() == fmt.Sprintf("manifest for %s not found", packager.BaseInvocationImage(dockerCli)) {
-			return nil, fmt.Errorf("unable to resolve Docker App base image: %s", packager.BaseInvocationImage(dockerCli))
-		}
-		return nil, err
-	}
-
-	inspect, _, err := dockerCli.Client().ImageInspectWithRaw(context.TODO(), invocationImageName)
-	if err != nil {
-		return nil, err
-	}
-
-	return packager.ToCNAB(app, invocationImageName, inspect.ID)
+	return packager.ToCNAB(app, invocationImageName)
 }
 
 func makeInvocationImageName(meta metadata.AppMetadata, refOverride reference.NamedTagged) (string, error) {

internal/commands/bundle.go

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

internal/packager/cnab.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)