diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-05-05 13:48:33 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-05-05 13:52:09 -0400 |
| commit | fbab06796a4c9bc17d65259c7d6c85a483e9aefb (patch) | |
| tree | ed85d52f8558b6177813612a7d73fbb426b23517 /vendor/github.com/openshift | |
| parent | ee4e0aa43e963c2e42b1cc8298aaa9443f8f2b03 (diff) | |
| download | podman-fbab06796a4c9bc17d65259c7d6c85a483e9aefb.tar.gz podman-fbab06796a4c9bc17d65259c7d6c85a483e9aefb.tar.bz2 podman-fbab06796a4c9bc17d65259c7d6c85a483e9aefb.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.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/openshift/imagebuilder/imagebuilder.spec | 2 |
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 |