Merge pull request #5833 from vvoland/subpath-swarm-fix
cli/compose: Handle Volume Subpath
This commit is contained in:
commit
88a019a9bb
@ -67,6 +67,7 @@ func handleVolumeToMount(
|
|||||||
|
|
||||||
if volume.Volume != nil {
|
if volume.Volume != nil {
|
||||||
result.VolumeOptions.NoCopy = volume.Volume.NoCopy
|
result.VolumeOptions.NoCopy = volume.Volume.NoCopy
|
||||||
|
result.VolumeOptions.Subpath = volume.Volume.Subpath
|
||||||
}
|
}
|
||||||
|
|
||||||
if stackVolume.Name != "" {
|
if stackVolume.Name != "" {
|
||||||
|
@ -411,6 +411,7 @@ type ServiceVolumeBind struct {
|
|||||||
// ServiceVolumeVolume are options for a service volume of type volume
|
// ServiceVolumeVolume are options for a service volume of type volume
|
||||||
type ServiceVolumeVolume struct {
|
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
|
// ServiceVolumeImage are options for a service volume of type image
|
||||||
|
Loading…
x
Reference in New Issue
Block a user