diff --git a/frontend/dockerfile/linter/linter.go b/frontend/dockerfile/linter/linter.go index bb33a14229b3..a8f9e0ad0f83 100644 --- a/frontend/dockerfile/linter/linter.go +++ b/frontend/dockerfile/linter/linter.go @@ -91,8 +91,12 @@ func (rule *LinterRule[F]) Run(warn LintWarnFunc, location []parser.Range, txt . warn(rule.Name, rule.Description, rule.URL, short, location) } -func LintFormatShort(rulename, msg string, startLine int) string { - return fmt.Sprintf("%s: %s (line %d)", rulename, msg, startLine) +func LintFormatShort(rulename, msg string, line int) string { + msg = fmt.Sprintf("%s: %s", rulename, msg) + if line > 0 { + msg = fmt.Sprintf("%s (line %d)", msg, line) + } + return msg } type LintWarnFunc func(rulename, description, url, fmtmsg string, location []parser.Range) diff --git a/frontend/subrequests/lint/lint.go b/frontend/subrequests/lint/lint.go index 402a704b9550..46d93a00dd06 100644 --- a/frontend/subrequests/lint/lint.go +++ b/frontend/subrequests/lint/lint.go @@ -173,7 +173,7 @@ func PrintLintViolations(dt []byte, w io.Writer) error { if warning.URL != "" { fmt.Fprintf(w, " - %s", warning.URL) } - fmt.Fprintf(w, "\n%s\n", warning.Description) + fmt.Fprintf(w, "\n%s\n", warning.Detail) if warning.Location.SourceIndex < 0 { continue