mirror of
https://github.com/containers/podman.git
synced 2025-11-30 01:58:46 +08:00
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:
8
vendor/github.com/openshift/imagebuilder/builder.go
generated
vendored
8
vendor/github.com/openshift/imagebuilder/builder.go
generated
vendored
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user