Merge branch 'main' into issue-12709

Author: idsulik

loader/loader_test.go

@@ -597,6 +597,7 @@ services:
 		"GA":  strPtr("2.5"),
 		"BU":  strPtr(""),
 		"MEU": strPtr("Shadoks"),
+		"ZO":  nil,
 	}
 
 	assert.Check(t, is.Equal(2, len(config.Services)))
@@ -3777,3 +3778,24 @@ services:
 		Options: map[string]string{"bar": "zot"},
 	})
 }
+
+func TestImageVolume(t *testing.T) {
+	p, err := loadYAML(`
+name: imageVolume
+services:
+  test:
+    volumes:
+      - type: image
+        source: app/image
+        target: /mnt/image
+        image:
+          subpath: /foo
+`)
+	assert.NilError(t, err)
+	assert.DeepEqual(t, p.Services["test"].Volumes[0], types.ServiceVolumeConfig{
+		Type:   "image",
+		Source: "app/image",
+		Target: "/mnt/image",
+		Image:  &types.ServiceVolumeImage{SubPath: "/foo"},
+	})
+}

loader/loader_yaml_test.go

@@ -30,6 +30,9 @@ func TestParseYAMLFiles(t *testing.T) {
 			{
 				Filename: "test.yaml",
 				Content: []byte(`
+x-extension:
+    test1: first
+
 services:
   test:
     image: foo
@@ -40,6 +43,9 @@ services:
 			{
 				Filename: "override.yaml",
 				Content: []byte(`
+x-extension:
+    test2: second
+
 services:
   test:
     image: bar
@@ -58,6 +64,10 @@ services:
 				"init":    false,
 			},
 		},
+		"x-extension": map[string]interface{}{
+			"test1": "first",
+			"test2": "second",
+		},
 	})
 }
 

override/merge.go

@@ -20,7 +20,6 @@ import (
 	"cmp"
 	"fmt"
 	"slices"
-	"strings"
 
 	"github.com/compose-spec/compose-go/v2/tree"
 )
@@ -62,6 +61,7 @@ func init() {
 	mergeSpecials["services.*.extra_hosts"] = mergeExtraHosts
 	mergeSpecials["services.*.healthcheck.test"] = override
 	mergeSpecials["services.*.labels"] = mergeToSequence
+	mergeSpecials["services.*.volumes.*.volume.labels"] = mergeToSequence
 	mergeSpecials["services.*.logging"] = mergeLogging
 	mergeSpecials["services.*.networks"] = mergeNetworks
 	mergeSpecials["services.*.sysctls"] = mergeToSequence
@@ -104,7 +104,7 @@ func mergeYaml(e any, o any, p tree.Path) (any, error) {
 func mergeMappings(mapping map[string]any, other map[string]any, p tree.Path) (map[string]any, error) {
 	for k, v := range other {
 		e, ok := mapping[k]
-		if !ok || strings.HasPrefix(k, "x-") {
+		if !ok {
 			mapping[k] = v
 			continue
 		}
@@ -234,9 +234,17 @@ func mergeIPAMConfig(c any, o any, path tree.Path) (any, error) {
 	}
 
 	var ipamConfigs []any
-	for _, original := range c.([]any) {
+	configs, ok := c.([]any)
+	if !ok {
+		return o, fmt.Errorf("%s: unexpected type %T", path, c)
+	}
+	overrides, ok := o.([]any)
+	if !ok {
+		return o, fmt.Errorf("%s: unexpected type %T", path, c)
+	}
+	for _, original := range configs {
 		right := convertIntoMapping(original, nil)
-		for _, override := range o.([]any) {
+		for _, override := range overrides {
 			left := convertIntoMapping(override, nil)
 			if left["subnet"] != right["subnet"] {
 				// check if left is already in ipamConfigs, add it if not and continue with the next config

schema/compose-spec.json

@@ -418,7 +418,9 @@
                 "type": "object",
                 "required": ["type"],
                 "properties": {
-                  "type": {"type": "string"},
+                  "type": {"type": "string",
+                    "enum": ["bind", "volume", "tmpfs", "cluster", "image"]
+                  },
                   "source": {"type": "string"},
                   "target": {"type": "string"},
                   "read_only": {"type": ["boolean", "string"]},
@@ -437,6 +439,7 @@
                   "volume": {
                     "type": "object",
                     "properties": {
+                      "labels": {"$ref": "#/definitions/list_or_dict"},
                       "nocopy": {"type": ["boolean", "string"]},
                       "subpath": {"type": "string"}
                     },
@@ -456,6 +459,14 @@
                     },
                     "additionalProperties": false,
                     "patternProperties": {"^x-": {}}
+                  },
+                  "image": {
+                    "type": "object",
+                    "properties": {
+                      "subpath": {"type": "string"}
+                    },
+                    "additionalProperties": false,
+                    "patternProperties": {"^x-": {}}
                   }
                 },
                 "additionalProperties": false,

types/derived.gen.go

@@ -190,16 +190,25 @@ func (p *Project) getServicesByNames(names ...string) (Services, []string) {
 	if len(names) == 0 {
 		return p.Services, nil
 	}
+
 	services := Services{}
 	var servicesNotFound []string
 	for _, name := range names {
-		service, ok := p.Services[name]
-		if !ok {
+		matched := false
+
+		for serviceName, service := range p.Services {
+			match, _ := filepath.Match(name, serviceName)
+			if match {
+				services[serviceName] = service
+				matched = true
+			}
+		}
+
+		if !matched {
 			servicesNotFound = append(servicesNotFound, name)
-			continue
 		}
-		services[name] = service
 	}
+
 	return services, servicesNotFound
 }
 
@@ -639,7 +648,7 @@ func (p *Project) MarshalJSON(options ...func(*marshallOptions)) ([]byte, error)
 func (p Project) WithServicesEnvironmentResolved(discardEnvFiles bool) (*Project, error) {
 	newProject := p.deepCopy()
 	for i, service := range newProject.Services {
-		service.Environment = service.Environment.Resolve(newProject.Environment.Resolve).RemoveEmpty()
+		service.Environment = service.Environment.Resolve(newProject.Environment.Resolve)
 
 		environment := service.Environment.ToMapping()
 		for _, envFile := range service.EnvFiles {

types/project.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"slices"
+	"sort"
 	"strings"
 	"testing"
 
@@ -281,6 +282,18 @@ func TestWithServices(t *testing.T) {
 	assert.DeepEqual(t, seen, []string{"service_1", "service_2", "service_4"})
 }
 
+func TestWithServicesWithWildcard(t *testing.T) {
+	p := makeProject()
+	var seen []string
+	err := p.ForEachService([]string{"service_*"}, func(name string, _ *ServiceConfig) error {
+		seen = append(seen, name)
+		return nil
+	}, IgnoreDependencies)
+	assert.NilError(t, err)
+	sort.Strings(seen)
+	assert.DeepEqual(t, seen, []string{"service_1", "service_2", "service_3", "service_4", "service_5", "service_6"})
+}
+
 func TestServicesWithBuild(t *testing.T) {
 	p := makeProject()
 	assert.Equal(t, len(p.ServicesWithBuild()), 0)

types/project_test.go

@@ -541,6 +541,7 @@ type ServiceVolumeConfig struct {
 	Bind        *ServiceVolumeBind   `yaml:"bind,omitempty" json:"bind,omitempty"`
 	Volume      *ServiceVolumeVolume `yaml:"volume,omitempty" json:"volume,omitempty"`
 	Tmpfs       *ServiceVolumeTmpfs  `yaml:"tmpfs,omitempty" json:"tmpfs,omitempty"`
+	Image       *ServiceVolumeImage  `yaml:"image,omitempty" json:"image,omitempty"`
 
 	Extensions Extensions `yaml:"#extensions,inline,omitempty" json:"-"`
 }
@@ -575,6 +576,8 @@ const (
 	VolumeTypeNamedPipe = "npipe"
 	// VolumeTypeCluster is the type for mounting container storage interface (CSI) volumes
 	VolumeTypeCluster = "cluster"
+	// VolumeTypeImage is the tpe for mounting an image
+	VolumeTypeImage = "image"
 
 	// SElinuxShared share the volume content
 	SElinuxShared = "z"
@@ -618,8 +621,9 @@ const (
 
 // ServiceVolumeVolume are options for a service volume of type volume
 type ServiceVolumeVolume struct {
-	NoCopy  bool   `yaml:"nocopy,omitempty" json:"nocopy,omitempty"`
-	Subpath string `yaml:"subpath,omitempty" json:"subpath,omitempty"`
+	Labels  Mapping `yaml:"labels,omitempty" json:"labels,omitempty"`
+	NoCopy  bool    `yaml:"nocopy,omitempty" json:"nocopy,omitempty"`
+	Subpath string  `yaml:"subpath,omitempty" json:"subpath,omitempty"`
 
 	Extensions Extensions `yaml:"#extensions,inline,omitempty" json:"-"`
 }
@@ -633,6 +637,11 @@ type ServiceVolumeTmpfs struct {
 	Extensions Extensions `yaml:"#extensions,inline,omitempty" json:"-"`
 }
 
+type ServiceVolumeImage struct {
+	SubPath    string     `yaml:"subpath,omitempty" json:"subpath,omitempty"`
+	Extensions Extensions `yaml:"#extensions,inline,omitempty" json:"-"`
+}
+
 type FileMode int64
 
 // FileReferenceConfig for a reference to a swarm file object