docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-11-04 10:03:42 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

bake: restore consistent output for metadata

Browse Source 
Metadata formatting should not depend on the number
of targets.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2022-03-08 10:06:03 -08:00
parent 9fcea76dea
commit c255c04eed
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
commands/bake.go
View File

@@ -150,21 +150,13 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
return wrapBuildError(err, true) return wrapBuildError(err, true)
} }
if len(in.metadataFile) > 0 && resp != nil { if len(in.metadataFile) > 0 {
if len(resp) == 1 { dt := make(map[string]interface{})
for _, r := range resp { for t, r := range resp {
if err := writeMetadataFile(in.metadataFile, decodeExporterResponse(r.ExporterResponse)); err != nil { dt[t] = decodeExporterResponse(r.ExporterResponse)
return err }
} if err := writeMetadataFile(in.metadataFile, dt); err != nil {
} return err
} else {
dt := make(map[string]interface{})
for t, r := range resp {
dt[t] = decodeExporterResponse(r.ExporterResponse)
}
if err := writeMetadataFile(in.metadataFile, dt); err != nil {
return err
}
} }
} }