Merge pull request docker#5833 from vvoland/subpath-swarm-fix

thaJeztah · web-flow · commit 88a019a9bb16 · 2025-02-17T12:54:24.000+01:00
cli/compose: Handle Volume Subpath
diff --git a/cli/compose/convert/volume.go b/cli/compose/convert/volume.go
@@ -67,6 +67,7 @@ func handleVolumeToMount(
 
 	if volume.Volume != nil {
 		result.VolumeOptions.NoCopy = volume.Volume.NoCopy
+		result.VolumeOptions.Subpath = volume.Volume.Subpath
 	}
 
 	if stackVolume.Name != "" {
diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -410,7 +410,8 @@ type ServiceVolumeBind struct {
 
 // ServiceVolumeVolume are options for a service volume of type volume
 type ServiceVolumeVolume struct {
-	NoCopy bool `mapstructure:"nocopy" yaml:"nocopy,omitempty" json:"nocopy,omitempty"`
+	NoCopy  bool   `mapstructure:"nocopy" yaml:"nocopy,omitempty" json:"nocopy,omitempty"`
+	Subpath string `mapstructure:"subpath" yaml:"subpath,omitempty" json:"subpath,omitempty"`
 }
 
 // ServiceVolumeImage are options for a service volume of type image

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ func handleVolumeToMount(`
`67`	`67`
`68`	`68`	`if volume.Volume != nil {`
`69`	`69`	`result.VolumeOptions.NoCopy = volume.Volume.NoCopy`
	`70`	`+ result.VolumeOptions.Subpath = volume.Volume.Subpath`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`if stackVolume.Name != "" {`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,8 @@ type ServiceVolumeBind struct {`
`410`	`410`
`411`	`411`	`// ServiceVolumeVolume are options for a service volume of type volume`
`412`	`412`	`type ServiceVolumeVolume struct {`
`413`		- NoCopy bool `mapstructure:"nocopy" yaml:"nocopy,omitempty" json:"nocopy,omitempty"`
	`413`	+ NoCopy bool `mapstructure:"nocopy" yaml:"nocopy,omitempty" json:"nocopy,omitempty"`
	`414`	+ Subpath string `mapstructure:"subpath" yaml:"subpath,omitempty" json:"subpath,omitempty"`
`414`	`415`	`}`
`415`	`416`
`416`	`417`	`// ServiceVolumeImage are options for a service volume of type image`