Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-05-13 13:58:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pkg/compose: build: use jsonmessage.DisplayStream

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2026-04-21 14:57:29 +02:00
parent 4774cbfbcb
commit 8866b4b5aa
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkg/compose/build_classic.go
View file

@ -268,24 +268,21 @@ func (s *composeService) doBuildImage(ctx context.Context, project *types.Projec
defer response.Body.Close() //nolint:errcheck
imageID := ""
aux := func(msg jsonstream.Message) {
err = jsonmessage.DisplayStream(response.Body, buildBuff, jsonmessage.WithAuxCallback(func(msg jsonstream.Message) {
var result buildtypes.Result
if err := json.Unmarshal(*msg.Aux, &result); err != nil {
logrus.Errorf("Failed to parse aux message: %s", err)
} else {
imageID = result.ID
}
}
err = jsonmessage.DisplayJSONMessagesStream(response.Body, buildBuff, progBuff.FD(), true, aux)
}))
if err != nil {
var jerr *jsonstream.Error
if errors.As(err, &jerr) {
// If no error code is set, default to 1
if jerr.Code == 0 {
jerr.Code = 1
}
return "", cli.StatusError{Status: jerr.Message, StatusCode: jerr.Code}
//
// TODO(thaJeztah): DisplayStream should return a errdefs Error corresponding with the status-code.
return "", cli.StatusError{Status: jerr.Message, StatusCode: max(1, jerr.Code)}
}
return "", err
}