Bump Buidah to v1.42.0 for Podman v5.7

Vendor Buildah v1.42.0 into Podman for v5.7.0.
This will also drag in:

go.podman.io/common v0.66.0
go.podman.io/image v5.38.0
go.podman.io/storage v1.61.0

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
tomsweeneyredhat
2025-10-22 11:38:57 -04:00
parent 08c670b232
commit c72102d1b2
48 changed files with 367 additions and 903 deletions

View File

@@ -2,6 +2,7 @@ package config
import (
"fmt"
"maps"
"os"
"slices"
"strings"
@@ -136,9 +137,7 @@ func OverrideOCI(oconfig *v1.ImageConfig, overrideChanges []string, overrideConf
if oconfig.Labels == nil {
oconfig.Labels = make(map[string]string)
}
for k, v := range overrideConfig.Labels {
oconfig.Labels[k] = v
}
maps.Copy(oconfig.Labels, overrideConfig.Labels)
}
oconfig.StopSignal = overrideConfig.StopSignal
}
@@ -206,9 +205,7 @@ func OverrideDocker(dconfig *docker.Config, overrideChanges []string, overrideCo
if dconfig.Labels == nil {
dconfig.Labels = make(map[string]string)
}
for k, v := range overrideConfig.Labels {
dconfig.Labels[k] = v
}
maps.Copy(dconfig.Labels, overrideConfig.Labels)
}
dconfig.StopSignal = overrideConfig.StopSignal
dconfig.StopTimeout = overrideConfig.StopTimeout