mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-09 21:17:09 +08:00
bump compose-go to v2.4.7
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
This commit is contained in:
10
vendor/github.com/compose-spec/compose-go/v2/loader/extends.go
generated
vendored
10
vendor/github.com/compose-spec/compose-go/v2/loader/extends.go
generated
vendored
@ -29,7 +29,7 @@ import (
|
||||
|
||||
// as we use another service definition by `extends`, we must exclude attributes which creates dependency to another service
|
||||
// see https://github.com/compose-spec/compose-spec/blob/main/05-services.md#restrictions
|
||||
var exclusions = []string{"extends", "depends_on", "volumes_from"}
|
||||
var exclusions = []string{"depends_on", "volumes_from"}
|
||||
|
||||
func ApplyExtends(ctx context.Context, dict map[string]any, opts *Options, tracker *cycleTracker, post ...PostProcessor) error {
|
||||
a, ok := dict["services"]
|
||||
@ -123,13 +123,15 @@ func applyServiceExtends(ctx context.Context, name string, services map[string]a
|
||||
},
|
||||
})
|
||||
}
|
||||
for _, exclusion := range exclusions {
|
||||
delete(source, exclusion)
|
||||
}
|
||||
merged, err := override.ExtendService(source, service)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, exclusion := range exclusions {
|
||||
delete(merged, exclusion)
|
||||
}
|
||||
|
||||
delete(merged, "extends")
|
||||
services[name] = merged
|
||||
return merged, nil
|
||||
}
|
||||
|
1
vendor/github.com/compose-spec/compose-go/v2/paths/resolve.go
generated
vendored
1
vendor/github.com/compose-spec/compose-go/v2/paths/resolve.go
generated
vendored
@ -36,6 +36,7 @@ func ResolveRelativePaths(project map[string]any, base string, remotes []RemoteR
|
||||
r.resolvers = map[tree.Path]resolver{
|
||||
"services.*.build.context": r.absContextPath,
|
||||
"services.*.build.additional_contexts.*": r.absContextPath,
|
||||
"services.*.build.ssh.*": r.maybeUnixPath,
|
||||
"services.*.env_file.*.path": r.absPath,
|
||||
"services.*.label_file.*": r.absPath,
|
||||
"services.*.extends.file": r.absExtendsPath,
|
||||
|
5
vendor/github.com/compose-spec/compose-go/v2/paths/unix.go
generated
vendored
5
vendor/github.com/compose-spec/compose-go/v2/paths/unix.go
generated
vendored
@ -24,7 +24,10 @@ import (
|
||||
)
|
||||
|
||||
func (r *relativePathsResolver) maybeUnixPath(a any) (any, error) {
|
||||
p := a.(string)
|
||||
p, ok := a.(string)
|
||||
if !ok {
|
||||
return a, nil
|
||||
}
|
||||
p = ExpandUser(p)
|
||||
// Check if source is an absolute path (either Unix or Windows), to
|
||||
// handle a Windows client with a Unix daemon or vice-versa.
|
||||
|
1
vendor/github.com/compose-spec/compose-go/v2/transform/canonical.go
generated
vendored
1
vendor/github.com/compose-spec/compose-go/v2/transform/canonical.go
generated
vendored
@ -30,6 +30,7 @@ func init() {
|
||||
transformers["services.*.build.additional_contexts"] = transformKeyValue
|
||||
transformers["services.*.depends_on"] = transformDependsOn
|
||||
transformers["services.*.env_file"] = transformEnvFile
|
||||
transformers["services.*.label_file"] = transformStringOrList
|
||||
transformers["services.*.extends"] = transformExtends
|
||||
transformers["services.*.networks"] = transformServiceNetworks
|
||||
transformers["services.*.volumes.*"] = transformVolumeMount
|
||||
|
Reference in New Issue
Block a user