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

vendor: update compose-go to v1.19.0

Browse Source 
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
This commit is contained in:
David Karlsson
2023-09-29 20:52:04 +02:00
parent e6756d951a
commit c8002e58a4
10 changed files with 131 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
vendor/github.com/compose-spec/compose-go/loader/loader.go generated vendored
View File

@ -61,6 +61,8 @@ type Options struct {
SkipExtends bool
// SkipInclude will ignore `include` and only load model from file(s) set by ConfigDetails
SkipInclude bool
// SkipResolveEnvironment will ignore computing `environment` for services
SkipResolveEnvironment bool
// Interpolation options
Interpolate *interp.Options
// Discard 'env_file' entries after resolving to 'environment' section
@ -255,7 +257,6 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
loaded = append(loaded, mainFile)
includeRefs := make(map[string][]types.IncludeConfig)
first := true
for _, file := range configDetails.ConfigFiles {
var postProcessor PostProcessor
configDict := file.Config
@ -285,22 +286,21 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
}
}
if first {
first = false
if model == nil {
model = cfg
return nil
}
merged, err := merge([]*types.Config{model, cfg})
if err != nil {
return err
} else {
merged, err := merge([]*types.Config{model, cfg})
if err != nil {
return err
}
model = merged
}
if postProcessor != nil {
err = postProcessor.Apply(merged)
err = postProcessor.Apply(model)
if err != nil {
return err
}
}
model = merged
return nil
}
@ -337,6 +337,10 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
}
}
if model == nil {
return nil, errors.New("empty compose file")
}
project := &types.Project{
Name: opts.projectName,
WorkingDir: configDetails.WorkingDir,
@ -385,9 +389,14 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
project.ApplyProfiles(opts.Profiles)
err := project.ResolveServicesEnvironment(opts.discardEnvFiles)
if !opts.SkipResolveEnvironment {
err := project.ResolveServicesEnvironment(opts.discardEnvFiles)
if err != nil {
return nil, err
}
}
return project, err
return project, nil
}
func InvalidProjectNameErr(v string) error {