Merge pull request #5666 from tonistiigi/marshal-history-record-fix

llbsolver: take copy of history record to avoid marshal race
moby · Jan 16, 2025 · f101ab5 · f101ab5
2 parents 78bcf8d + fafab60
commit f101ab5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/solver/llbsolver/history.go b/solver/llbsolver/history.go
@@ -680,6 +680,8 @@ func (h *HistoryQueue) Update(ctx context.Context, e *controlapi.BuildHistoryEve
 	h.mu.Lock()
 	defer h.mu.Unlock()
 
+	e = e.CloneVT()
+
 	if e.Type == controlapi.BuildHistoryEventType_STARTED {
 		h.active[e.Record.Ref] = e.Record
 		h.ps.Send(e)