From 0566e62995546899a1dee732494f2a58a506aaad Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Fri, 2 Sep 2022 16:45:51 +0100 Subject: [PATCH] progress: add prefix to vertex progress group As buildkit now uses progress groups for the COPY --link instruction we need to ensure that we additionally prefix the progress group name, or the target name will be left off in bake commands with more than one target. Signed-off-by: Justin Chadwell --- util/progress/multiwriter.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/progress/multiwriter.go b/util/progress/multiwriter.go index 86efac32..a4f9b503 100644 --- a/util/progress/multiwriter.go +++ b/util/progress/multiwriter.go @@ -24,6 +24,9 @@ func (p *prefixed) Write(v *client.SolveStatus) { if p.force { for _, v := range v.Vertexes { v.Name = addPrefix(p.pfx, v.Name) + if v.ProgressGroup != nil { + v.ProgressGroup.Name = addPrefix(p.pfx, v.ProgressGroup.Name) + } } } p.Writer.Write(v)