docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-10 21:47:13 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

vendor: github.com/compose-spec/compose-go v1.14.0

Browse Source 
https: //github.com/compose-spec/compose-go/compare/v1.13.4...v1.14.0
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2023-06-06 17:34:34 +02:00
parent 7cef021a8a
commit 9a125afba0
17 changed files with 701 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
vendor/github.com/compose-spec/compose-go/cli/options.go generated vendored
View File

@ -255,9 +255,8 @@ func WithDotEnv(o *ProjectOptions) error {
return err
}
for k, v := range envMap {
o.Environment[k] = v
if osVal, ok := os.LookupEnv(k); ok {
o.Environment[k] = osVal
if _, set := o.Environment[k]; !set {
o.Environment[k] = v
}
}
return nil
@ -304,15 +303,12 @@ func GetEnvFromFile(currentEnv map[string]string, workingDir string, filenames [
}
env, err := dotenv.ParseWithLookup(bytes.NewReader(b), func(k string) (string, bool) {
v, ok := envMap[k]
v, ok := currentEnv[k]
if ok {
return v, true
}
v, ok = currentEnv[k]
if !ok {
return "", false
}
return v, true
v, ok = envMap[k]
return v, ok
})
if err != nil {
return envMap, errors.Wrapf(err, "failed to read %s", dotEnvFile)
@ -461,8 +457,9 @@ func withNamePrecedenceLoad(absWorkingDir string, options *ProjectOptions) func(
func withConvertWindowsPaths(options *ProjectOptions) func(*loader.Options) {
return func(o *loader.Options) {
o.ConvertWindowsPaths = utils.StringToBool(options.Environment["COMPOSE_CONVERT_WINDOWS_PATHS"])
o.ResolvePaths = true
if o.ResolvePaths {
o.ConvertWindowsPaths = utils.StringToBool(options.Environment["COMPOSE_CONVERT_WINDOWS_PATHS"])
}
}
}