Bump github.com/containers/storage from 1.24.4 to 1.24.5

Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.24.4 to 1.24.5.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.24.4...v1.24.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
dependabot-preview[bot]
2021-01-11 10:23:37 +00:00
committed by Daniel J Walsh
parent 41613bdb96
commit 63ecd1215a
13 changed files with 96 additions and 45 deletions

View File

@@ -761,19 +761,29 @@ func (d *Driver) optsAppendMappings(opts string, uidMaps, gidMaps []idtools.IDMa
}
if uidMaps != nil {
var uids, gids bytes.Buffer
for _, i := range uidMaps {
if uids.Len() > 0 {
uids.WriteString(":")
if len(uidMaps) == 1 && uidMaps[0].Size == 1 {
uids.WriteString(fmt.Sprintf("squash_to_uid=%d", uidMaps[0].HostID))
} else {
uids.WriteString("uidmapping=")
for _, i := range uidMaps {
if uids.Len() > 0 {
uids.WriteString(":")
}
uids.WriteString(fmt.Sprintf("%d:%d:%d", i.ContainerID, i.HostID, i.Size))
}
uids.WriteString(fmt.Sprintf("%d:%d:%d", i.ContainerID, i.HostID, i.Size))
}
for _, i := range gidMaps {
if gids.Len() > 0 {
gids.WriteString(":")
if len(gidMaps) == 1 && gidMaps[0].Size == 1 {
gids.WriteString(fmt.Sprintf("squash_to_gid=%d", gidMaps[0].HostID))
} else {
gids.WriteString("gidmapping=")
for _, i := range gidMaps {
if gids.Len() > 0 {
gids.WriteString(":")
}
gids.WriteString(fmt.Sprintf("%d:%d:%d", i.ContainerID, i.HostID, i.Size))
}
gids.WriteString(fmt.Sprintf("%d:%d:%d", i.ContainerID, i.HostID, i.Size))
}
return fmt.Sprintf("%s,uidmapping=%s,gidmapping=%s", opts, uids.String(), gids.String())
return fmt.Sprintf("%s,%s,%s", opts, uids.String(), gids.String())
}
return opts
}