From c2b2b679071af99b42046d82c45e5862938db9eb Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Thu, 26 Jun 2025 11:17:16 +0200 Subject: [PATCH 1/2] check progress default value instead of empty string to use BUILDKIT_PROGRESS env variable value Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- pkg/compose/build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/compose/build.go b/pkg/compose/build.go index 8a4043a86b9..d404fd0a628 100644 --- a/pkg/compose/build.go +++ b/pkg/compose/build.go @@ -172,7 +172,7 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opti if options.Quiet { options.Progress = progress.ModeQuiet } - if options.Progress == "" { + if options.Progress == progress.ModeAuto { options.Progress = os.Getenv("BUILDKIT_PROGRESS") } w, err = xprogress.NewPrinter(progressCtx, os.Stdout, progressui.DisplayMode(options.Progress), From 236a2cb95ecead896268068614af8340ffe5d743 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:23:39 +0200 Subject: [PATCH 2/2] use errdefs.IsNotImplemented to check if the logging is not implemented Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- pkg/compose/logs.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/compose/logs.go b/pkg/compose/logs.go index 284068e4cfa..b9a108fc3d3 100644 --- a/pkg/compose/logs.go +++ b/pkg/compose/logs.go @@ -18,12 +18,11 @@ package compose import ( "context" - "errors" "io" "time" + "github.com/containerd/errdefs" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/stdcopy" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" @@ -64,8 +63,7 @@ func (s *composeService) Logs( for _, ctr := range containers { eg.Go(func() error { err := s.logContainers(ctx, consumer, ctr, options) - var notImplErr errdefs.ErrNotImplemented - if errors.As(err, ¬ImplErr) { + if errdefs.IsNotImplemented(err) { logrus.Warnf("Can't retrieve logs for %q: %s", getCanonicalContainerName(ctr), err.Error()) return nil } @@ -106,8 +104,7 @@ func (s *composeService) Logs( Tail: options.Tail, Timestamps: options.Timestamps, }) - var notImplErr errdefs.ErrNotImplemented - if errors.As(err, ¬ImplErr) { + if errdefs.IsNotImplemented(err) { // ignore return nil }