mirror of
				https://gitea.com/Lydanne/buildx.git
				synced 2025-11-01 00:23:56 +08:00 
			
		
		
		
	build: multi-node build support
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
		| @@ -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, | ||||
| 	} | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -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}, | ||||
| 	} | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Tonis Tiigi
					Tonis Tiigi