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

@@ -403,6 +403,14 @@ func (b *Builder) extractHeadingArgsFromNode(node *parser.Node) error {
// Use a separate builder to evaluate the heading args
tempBuilder := NewBuilder(b.UserArgs)
// Built-in ARGs are declared implicitly in the heading and should be resolvable in its scope
for k, v := range tempBuilder.BuiltinArgDefaults {
tempBuilder.AllowedArgs[k] = true
if _, ok := tempBuilder.Args[k]; !ok {
tempBuilder.Args[k] = v
}
}
// Evaluate all the heading arg commands
for _, c := range args {
step := tempBuilder.Step()

View File

@@ -562,12 +562,12 @@ func expose(b *Builder, args []string, attributes map[string]bool, flagArgs []st
existing := map[string]struct{}{}
for k := range b.RunConfig.ExposedPorts {
existing[k.Port()] = struct{}{}
existing[k.Port()+"/"+k.Proto()] = struct{}{}
}
for _, port := range args {
dp := docker.Port(port)
if _, exists := existing[dp.Port()]; !exists {
if _, exists := existing[dp.Port()+"/"+dp.Proto()]; !exists {
b.RunConfig.ExposedPorts[docker.Port(fmt.Sprintf("%s/%s", dp.Port(), dp.Proto()))] = struct{}{}
}
}

View File

@@ -12,7 +12,7 @@
#
%global golang_version 1.19
%{!?version: %global version 1.2.17}
%{!?version: %global version 1.2.19}
%{!?release: %global release 1}
%global package_name imagebuilder
%global product_name Container Image Builder