opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-14 18:19:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

image lookup: do not match *any* tags

Browse Source 
For reasons buried in the history of Podman, looking up an untagged
image would match any tag of matching image. For instance, looking up
centos would match a local image centos:foobar.  Change that behavior
to only match the latest tag.

Fix: #11964
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2021-11-22 13:48:14 +01:00
parent a55473bea8
commit 0d1aaf080e
35 changed files with 593 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/github.com/containers/storage/pkg/idtools/idtools.go generated vendored
View File

@@ -185,18 +185,14 @@ func (i *IDMappings) RootPair() IDPair {
// Remapping is only performed if the ids aren't already the remapped root ids
func (i *IDMappings) ToHost(pair IDPair) (IDPair, error) {
var err error
target := i.RootPair()
var target IDPair
if pair.UID != target.UID {
target.UID, err = toHost(pair.UID, i.uids)
if err != nil {
return target, err
}
target.UID, err = toHost(pair.UID, i.uids)
if err != nil {
return target, err
}
if pair.GID != target.GID {
target.GID, err = toHost(pair.GID, i.gids)
}
target.GID, err = toHost(pair.GID, i.gids)
return target, err
}
@@ -293,7 +289,7 @@ func parseSubidFile(path, username string) (ranges, error) {
func checkChownErr(err error, name string, uid, gid int) error {
if e, ok := err.(*os.PathError); ok && e.Err == syscall.EINVAL {
return errors.Wrapf(err, "potentially insufficient UIDs or GIDs available in user namespace (requested %d:%d for %s): Check /etc/subuid and /etc/subgid", uid, gid, name)
return errors.Wrapf(err, "potentially insufficient UIDs or GIDs available in user namespace (requested %d:%d for %s): Check /etc/subuid and /etc/subgid if configured locally", uid, gid, name)
}
return err
}