Skip to content

Add BUILDKITD_LOG_FORMAT env var support for log formatting #6246

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −0
Open

Add BUILDKITD_LOG_FORMAT env var support for log formatting #6246

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
f7a8b62
read BUILDKITD_LOG_FORMAT env
Sep 25, 2025
875d78a
Merge branch 'moby:master' into log_format_environ
kivarun Oct 30, 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
3 changes: 3 additions & 0 deletions cmd/buildctl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ func main() {
debugEnabled = context.GlobalBool("debug")
// Use Format flag to control log formatter
logFormat := context.GlobalString("log-format")
if logFormat == "" {
logFormat = os.Getenv("BUILDKITD_LOG_FORMAT")
Copy link
Member

@tonistiigi tonistiigi Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is in buildctl but env is called BUILDKITD

}
switch logFormat {
case "json":
logrus.SetFormatter(&logrus.JSONFormatter{})
Expand Down
1 change: 1 addition & 0 deletions cmd/buildkitd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ func main() {
Name: "log-format",
Usage: "log formatter: json or text",
Value: "text",
EnvVar: "BUILDKITD_LOG_FORMAT",
},
cli.StringFlag{
Name: "group",
Expand Down
Loading