summaryrefslogtreecommitdiff
path: root/vendor/github.com/openshift
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-05-04 13:23:33 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2022-05-05 04:41:06 -0400
commited159f864dc8e2cd79d98fb46a28f1413dc1a7fb (patch)
tree612c1c0010014522962866c47bc570d9860770be /vendor/github.com/openshift
parentbdaac4b2b6573d0954c58da9968536017160b1ed (diff)
downloadpodman-ed159f864dc8e2cd79d98fb46a28f1413dc1a7fb.tar.gz
podman-ed159f864dc8e2cd79d98fb46a28f1413dc1a7fb.tar.bz2
podman-ed159f864dc8e2cd79d98fb46a28f1413dc1a7fb.zip
Vendor in containers/buildah@v1.26.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/openshift')
-rw-r--r--vendor/github.com/openshift/imagebuilder/dispatchers.go2
-rw-r--r--vendor/github.com/openshift/imagebuilder/imagebuilder.spec2
2 files changed, 3 insertions, 1 deletions
diff --git a/vendor/github.com/openshift/imagebuilder/dispatchers.go b/vendor/github.com/openshift/imagebuilder/dispatchers.go
index fd05f031c..c437e4c23 100644
--- a/vendor/github.com/openshift/imagebuilder/dispatchers.go
+++ b/vendor/github.com/openshift/imagebuilder/dispatchers.go
@@ -234,7 +234,9 @@ func from(b *Builder, args []string, attributes map[string]bool, flagArgs []stri
return fmt.Errorf("Windows does not support FROM scratch")
}
}
+ defaultArgs := envMapAsSlice(builtinBuildArgs)
userArgs := mergeEnv(envMapAsSlice(b.Args), b.Env)
+ userArgs = mergeEnv(defaultArgs, userArgs)
for _, a := range flagArgs {
arg, err := ProcessWord(a, userArgs)
if err != nil {
diff --git a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec
index 6a88a4fc4..143bfc355 100644
--- a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec
+++ b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec
@@ -12,7 +12,7 @@
#
%global golang_version 1.8.1
-%{!?version: %global version 1.2.3}
+%{!?version: %global version 1.2.4-dev}
%{!?release: %global release 1}
%global package_name imagebuilder
%global product_name Container Image Builder