Skip to content

check progress default value instead of empty string to use BUILDKIT_PROGRESS env variable value #12982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndeloof merged 2 commits into from
Jun 26, 2025
Merged

check progress default value instead of empty string to use BUILDKIT_PROGRESS env variable value #12982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2b2b67
check progress default value instead of empty string to use BUILDKIT_…
glours Jun 26, 2025
236a2cb
use errdefs.IsNotImplemented to check if the logging is not implemented
glours Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/compose/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
9 changes: 3 additions & 6 deletions pkg/compose/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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, &notImplErr) {
if errdefs.IsNotImplemented(err) {
logrus.Warnf("Can't retrieve logs for %q: %s", getCanonicalContainerName(ctr), err.Error())
return nil
}
Expand Down Expand Up @@ -106,8 +104,7 @@ func (s *composeService) Logs(
Tail: options.Tail,
Timestamps: options.Timestamps,
})
var notImplErr errdefs.ErrNotImplemented
if errors.As(err, &notImplErr) {
if errdefs.IsNotImplemented(err) {
// ignore
return nil
}
Expand Down