1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5832 from vvoland/swarm-fix-image-subpath

Browse Source 
cli/compose: Fix Image Subpath
This commit is contained in:
Sebastiaan van Stijn 2025-02-17 12:53:34 +01:00 committed by GitHub
commit b73653ef41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/compose/convert/volume.go
View File

@ -107,9 +107,9 @@ func handleImageToMount(volume composetypes.ServiceVolumeConfig) (mount.Mount, e
if volume.Cluster != nil { if volume.Cluster != nil {
return mount.Mount{}, errors.New("cluster options are incompatible with type image") return mount.Mount{}, errors.New("cluster options are incompatible with type image")
} }
if volume.Bind != nil { if volume.Image != nil {
result.BindOptions = &mount.BindOptions{ result.ImageOptions = &mount.ImageOptions{
Propagation: mount.Propagation(volume.Bind.Propagation), Subpath: volume.Image.Subpath,
} }
} }
return result, nil return result, nil

2
cli/compose/types/types.go
View File

@ -415,7 +415,7 @@ type ServiceVolumeVolume struct {
// ServiceVolumeImage are options for a service volume of type image // ServiceVolumeImage are options for a service volume of type image
type ServiceVolumeImage struct { type ServiceVolumeImage struct {
Subpath bool `mapstructure:"subpath" yaml:"subpath,omitempty" json:"subpath,omitempty"` Subpath string `mapstructure:"subpath" yaml:"subpath,omitempty" json:"subpath,omitempty"`
} }
// ServiceVolumeTmpfs are options for a service volume of type tmpfs // ServiceVolumeTmpfs are options for a service volume of type tmpfs