mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-16 08:27:06 +08:00
bump compose-go v2.4.6
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
10
vendor/github.com/compose-spec/compose-go/v2/loader/example1.label
generated
vendored
Normal file
10
vendor/github.com/compose-spec/compose-go/v2/loader/example1.label
generated
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
# passed through
|
||||
FOO=foo_from_label_file
|
||||
LABEL.WITH.DOT=ok
|
||||
LABEL_WITH_UNDERSCORE=ok
|
||||
|
||||
# overridden in example2.label
|
||||
BAR=bar_from_label_file
|
||||
|
||||
# overridden in full-example.yml
|
||||
BAZ=baz_from_label_file
|
4
vendor/github.com/compose-spec/compose-go/v2/loader/example2.label
generated
vendored
Normal file
4
vendor/github.com/compose-spec/compose-go/v2/loader/example2.label
generated
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
BAR=bar_from_label_file_2
|
||||
|
||||
# overridden in configDetails.Labels
|
||||
QUX=quz_from_label_file_2
|
8
vendor/github.com/compose-spec/compose-go/v2/loader/extends.go
generated
vendored
8
vendor/github.com/compose-spec/compose-go/v2/loader/extends.go
generated
vendored
@ -27,6 +27,10 @@ import (
|
||||
"github.com/compose-spec/compose-go/v2/types"
|
||||
)
|
||||
|
||||
// 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"}
|
||||
|
||||
func ApplyExtends(ctx context.Context, dict map[string]any, opts *Options, tracker *cycleTracker, post ...PostProcessor) error {
|
||||
a, ok := dict["services"]
|
||||
if !ok {
|
||||
@ -123,7 +127,9 @@ func applyServiceExtends(ctx context.Context, name string, services map[string]a
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
delete(merged, "extends")
|
||||
for _, exclusion := range exclusions {
|
||||
delete(merged, exclusion)
|
||||
}
|
||||
services[name] = merged
|
||||
return merged, nil
|
||||
}
|
||||
|
4
vendor/github.com/compose-spec/compose-go/v2/loader/full-example.yml
generated
vendored
4
vendor/github.com/compose-spec/compose-go/v2/loader/full-example.yml
generated
vendored
@ -210,6 +210,10 @@ services:
|
||||
# - "com.example.number=42"
|
||||
# - "com.example.empty-label"
|
||||
|
||||
label_file:
|
||||
- ./example1.label
|
||||
- ./example2.label
|
||||
|
||||
links:
|
||||
- db
|
||||
- db:database
|
||||
|
6
vendor/github.com/compose-spec/compose-go/v2/loader/loader.go
generated
vendored
6
vendor/github.com/compose-spec/compose-go/v2/loader/loader.go
generated
vendored
@ -637,6 +637,12 @@ func modelToProject(dict map[string]interface{}, opts *Options, configDetails ty
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
project, err = project.WithServicesLabelsResolved(opts.discardEnvFiles)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return project, nil
|
||||
}
|
||||
|
||||
|
2
vendor/github.com/compose-spec/compose-go/v2/loader/validate.go
generated
vendored
2
vendor/github.com/compose-spec/compose-go/v2/loader/validate.go
generated
vendored
@ -155,7 +155,7 @@ func checkConsistency(project *types.Project) error {
|
||||
|
||||
if s.Develop != nil && s.Develop.Watch != nil {
|
||||
for _, watch := range s.Develop.Watch {
|
||||
if watch.Action != types.WatchActionRebuild && watch.Target == "" {
|
||||
if watch.Target == "" && watch.Action != types.WatchActionRebuild && watch.Action != types.WatchActionRestart {
|
||||
return fmt.Errorf("services.%s.develop.watch: target is required for non-rebuild actions: %w", s.Name, errdefs.ErrInvalid)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user