containerd
/
fuse-overlayfs-snapshotter
mirror of https://github.com/containerd/fuse-overlayfs-snapshotter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added convertion logic for multiple id mapping snasphotter labels 

Signed-off-by: Henry Wang <henwang@amazon.com>
This commit is contained in:
Henry Wang 2024-12-06 22:07:10 +00:00
parent 84788daec1
commit 0542bd50d8
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuseoverlayfs.go
View File

@ -482,10 +482,10 @@ func (o *snapshotter) mounts(s storage.Snapshot, info snapshots.Info) []mount.Mo
options = append(options, fmt.Sprintf("lowerdir=%s", strings.Join(parentPaths, ":"))) options = append(options, fmt.Sprintf("lowerdir=%s", strings.Join(parentPaths, ":")))
if mapping, ok := info.Labels["containerd.io/snapshot/uidmapping"]; ok { if mapping, ok := info.Labels["containerd.io/snapshot/uidmapping"]; ok {
options = append(options, fmt.Sprintf("uidmapping=%s", mapping)) options = append(options, fmt.Sprintf("uidmapping=%s", convertIDMappingOption(mapping)))
} }
if mapping, ok := info.Labels["containerd.io/snapshot/gidmapping"]; ok { if mapping, ok := info.Labels["containerd.io/snapshot/gidmapping"]; ok {
options = append(options, fmt.Sprintf("gidmapping=%s", mapping)) options = append(options, fmt.Sprintf("gidmapping=%s", convertIDMappingOption(mapping)))
} }
return []mount.Mount{ return []mount.Mount{
{ {
@ -509,3 +509,10 @@ func (o *snapshotter) workPath(id string) string {
func (o *snapshotter) Close() error { func (o *snapshotter) Close() error {
return o.ms.Close() return o.ms.Close()
} }
// fuseIDMappingOption converts mapping entries joined with ',' to ':'
// This is expected by the fuse-overlayfs program:
// https://github.com/containers/fuse-overlayfs/blob/main/fuse-overlayfs.1.md
func convertIDMappingOption(label string) string {
return strings.ReplaceAll(label, ",", ":")
}