build: multi-node build support

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

util/imagetools/create.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 
 	"github.com/containerd/containerd/content"
+	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/images"
 	"github.com/docker/distribution/reference"
 	"github.com/opencontainers/go-digest"
@@ -152,10 +153,17 @@ func (r *Resolver) Push(ctx context.Context, ref reference.Named, desc ocispec.D
 	}
 	cw, err := p.Push(ctx, desc)
 	if err != nil {
+		if errdefs.IsAlreadyExists(err) {
+			return nil
+		}
 		return err
 	}
 
-	return content.Copy(ctx, cw, bytes.NewReader(dt), desc.Size, desc.Digest)
+	err = content.Copy(ctx, cw, bytes.NewReader(dt), desc.Size, desc.Digest)
+	if errdefs.IsAlreadyExists(err) {
+		return nil
+	}
+	return err
 }
 
 func (r *Resolver) loadConfig(ctx context.Context, in string, dt []byte) (*ocispec.Image, error) {

util/progress/multiwriter.go

@@ -3,14 +3,17 @@ package progress
 import (
 	"context"
 	"strings"
+	"sync"
 
 	"github.com/moby/buildkit/client"
 	"golang.org/x/sync/errgroup"
 )
 
 type MultiWriter struct {
-	w  Writer
-	eg *errgroup.Group
+	w     Writer
+	eg    *errgroup.Group
+	once  sync.Once
+	ready chan struct{}
 }
 
 func (mw *MultiWriter) WithPrefix(pfx string, force bool) Writer {
@@ -21,6 +24,9 @@ func (mw *MultiWriter) WithPrefix(pfx string, force bool) Writer {
 		in:   in,
 	}
 	mw.eg.Go(func() error {
+		mw.once.Do(func() {
+			close(mw.ready)
+		})
 		for {
 			select {
 			case v, ok := <-in:
@@ -77,14 +83,18 @@ func NewMultiWriter(pw Writer) *MultiWriter {
 	}
 	eg, _ := errgroup.WithContext(context.TODO())
 
+	ready := make(chan struct{})
+
 	go func() {
+		<-ready
 		eg.Wait()
 		close(pw.Status())
 	}()
 
 	return &MultiWriter{
-		w:  pw,
-		eg: eg,
+		w:     pw,
+		eg:    eg,
+		ready: ready,
 	}
 }
 

util/progress/writer.go

@@ -1,7 +1,11 @@
 package progress
 
 import (
+	"time"
+
 	"github.com/moby/buildkit/client"
+	"github.com/moby/buildkit/identity"
+	"github.com/opencontainers/go-digest"
 )
 
 type Writer interface {
@@ -9,3 +13,31 @@ type Writer interface {
 	Err() error
 	Status() chan *client.SolveStatus
 }
+
+func Write(w Writer, name string, f func() error) {
+	status := w.Status()
+	dgst := digest.FromBytes([]byte(identity.NewID()))
+	tm := time.Now()
+
+	vtx := client.Vertex{
+		Digest:  dgst,
+		Name:    name,
+		Started: &tm,
+	}
+
+	status <- &client.SolveStatus{
+		Vertexes: []*client.Vertex{&vtx},
+	}
+
+	err := f()
+
+	tm2 := time.Now()
+	vtx2 := vtx
+	vtx2.Completed = &tm2
+	if err != nil {
+		vtx2.Error = err.Error()
+	}
+	status <- &client.SolveStatus{
+		Vertexes: []*client.Vertex{&vtx2},
+	}
+}