Cherry picked from commit 2e8bce201e with additional updates required for the v4.2.0-rhel branch. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com> Assisted by AI: Cursor <Auto> Signed-off-by: Chris Evich <cevich@redhat.com>
2e8bce201e
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Also update vendor of containers/common,buildah,storage,image Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2069586 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>