mirror of
https://github.com/containers/podman.git
synced 2025-12-01 02:27:13 +08:00
vendor: update common and buildah
vendor the following dependencies: - https://github.com/containers/common/pull/2375 - https://github.com/containers/buildah/pull/6074 Closes: https://github.com/containers/podman/issues/25634 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
11
vendor/github.com/openshift/imagebuilder/dispatchers.go
generated
vendored
11
vendor/github.com/openshift/imagebuilder/dispatchers.go
generated
vendored
@@ -41,18 +41,11 @@ var builtinArgDefaults = map[string]string{
|
||||
"TARGETPLATFORM": localspec.OS + "/" + localspec.Architecture,
|
||||
"TARGETOS": localspec.OS,
|
||||
"TARGETARCH": localspec.Architecture,
|
||||
"TARGETVARIANT": localspec.Variant,
|
||||
"TARGETVARIANT": "",
|
||||
"BUILDPLATFORM": localspec.OS + "/" + localspec.Architecture,
|
||||
"BUILDOS": localspec.OS,
|
||||
"BUILDARCH": localspec.Architecture,
|
||||
"BUILDVARIANT": localspec.Variant,
|
||||
}
|
||||
|
||||
func init() {
|
||||
if localspec.Variant != "" {
|
||||
builtinArgDefaults["TARGETPLATFORM"] = builtinArgDefaults["TARGETPLATFORM"] + "/" + localspec.Variant
|
||||
builtinArgDefaults["BUILDPLATFORM"] = builtinArgDefaults["BUILDPLATFORM"] + "/" + localspec.Variant
|
||||
}
|
||||
"BUILDVARIANT": "",
|
||||
}
|
||||
|
||||
// ENV foo bar
|
||||
|
||||
Reference in New Issue
Block a user