mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-09 21:17:09 +08:00
vendor: buildkit, docker/docker and docker/cli v27.0.1
diffs: - https://github.com/docker/cli/compare/v26.1.4..v27.0.1 - https://github.com/docker/docker/compare/v26.1.4..v27.0.1 - https://github.com/moby/buildkit/compare/v0.14.1...aaaf86e5470bffbb395f5c15ad4a1c152642ea30 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
9
vendor/github.com/moby/buildkit/util/progress/progressui/colors.go
generated
vendored
9
vendor/github.com/moby/buildkit/util/progress/progressui/colors.go
generated
vendored
@ -1,13 +1,13 @@
|
||||
package progressui
|
||||
|
||||
import (
|
||||
"encoding/csv"
|
||||
"errors"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/moby/buildkit/util/bklog"
|
||||
"github.com/morikuni/aec"
|
||||
"github.com/tonistiigi/go-csvvalue"
|
||||
)
|
||||
|
||||
var termColorMap = map[string]aec.ANSI{
|
||||
@ -59,9 +59,9 @@ func setUserDefinedTermColors(colorsEnv string) {
|
||||
}
|
||||
|
||||
func readBuildkitColorsEnv(colorsEnv string) []string {
|
||||
csvReader := csv.NewReader(strings.NewReader(colorsEnv))
|
||||
csvReader := csvvalue.NewParser()
|
||||
csvReader.Comma = ':'
|
||||
fields, err := csvReader.Read()
|
||||
fields, err := csvReader.Fields(colorsEnv, nil)
|
||||
if err != nil {
|
||||
bklog.L.WithError(err).Warnf("Could not parse BUILDKIT_COLORS. Falling back to defaults.")
|
||||
return nil
|
||||
@ -70,8 +70,7 @@ func readBuildkitColorsEnv(colorsEnv string) []string {
|
||||
}
|
||||
|
||||
func readRGB(v string) aec.ANSI {
|
||||
csvReader := csv.NewReader(strings.NewReader(v))
|
||||
fields, err := csvReader.Read()
|
||||
fields, err := csvvalue.Fields(v, nil)
|
||||
if err != nil {
|
||||
bklog.L.WithError(err).Warnf("Could not parse value %s as valid comma-separated RGB color. Ignoring.", v)
|
||||
return nil
|
||||
|
Reference in New Issue
Block a user