tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use logrus instead of direct output to stderr. 

Signed-off-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
Felix Fontein 2024-07-20 16:40:52 +02:00 committed by Nicolas De loof
parent 329ad73922
commit 1d608e0338
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/compose/build_classic.go
View File

@ -44,6 +44,8 @@ import (
"github.com/docker/docker/pkg/streamformatter"
"github.com/docker/compose/v2/pkg/api"
"github.com/sirupsen/logrus"
)
//nolint:gocyclo
@ -180,7 +182,7 @@ func (s *composeService) doBuildClassic(ctx context.Context, project *types.Proj
aux := func(msg jsonmessage.JSONMessage) {
var result dockertypes.BuildResult
if err := json.Unmarshal(*msg.Aux, &result); err != nil {
fmt.Fprintf(s.stderr(), "Failed to parse aux message: %s", err)
logrus.Errorf("Failed to parse aux message: %s", err)
} else {
imageID = result.ID
}

3
pkg/compose/down.go
View File

@ -33,6 +33,7 @@ import (
imageapi "github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/errdefs"
"github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
)
@ -107,7 +108,7 @@ func (s *composeService) down(ctx context.Context, projectName string, options a
}
if !resourceToRemove && len(ops) == 0 {
fmt.Fprintf(s.stderr(), "Warning: No resource found to remove for project %q.\n", projectName)
logrus.Warnf("Warning: No resource found to remove for project %q.", projectName)
}
eg, _ := errgroup.WithContext(ctx)