mirror of
https://github.com/siderolabs/talos.git
synced 2025-10-28 15:01:13 +01:00
Use `Progress`, and options to pass around the way messages are written. Fixed some tiny issues in the code, but otherwise no functional changes. To make colored output work with `docker run`, switched back image generation to use volume mount for output (old mode is still functioning, but it's not the default, and it works when docker is not running on the same host). Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
29 lines
716 B
Go
29 lines
716 B
Go
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
package imager
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/siderolabs/talos/pkg/reporter"
|
|
)
|
|
|
|
// progressPrintf wraps a reporter.Reporter to report progress via Printf logging.
|
|
func progressPrintf(report *reporter.Reporter, status reporter.Update) func(format string, args ...any) {
|
|
return func(format string, args ...any) {
|
|
msg := status.Message
|
|
extra := fmt.Sprintf(format, args...)
|
|
|
|
if extra != "" {
|
|
msg += "\n\t" + extra
|
|
}
|
|
|
|
report.Report(reporter.Update{
|
|
Message: msg,
|
|
Status: status.Status,
|
|
})
|
|
}
|
|
}
|