diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-05 06:31:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 06:31:39 -0400 |
| commit | 8ed517576cc185ddfa5d2e3af9c034e9ae375841 (patch) | |
| tree | 5a8c5e0de2891aabff624492a1839f2be017c5f1 /vendor/github.com/openshift/imagebuilder | |
| parent | 88f8d398b357c60f8b78b8dedf1e1515a534b873 (diff) | |
| parent | ed159f864dc8e2cd79d98fb46a28f1413dc1a7fb (diff) | |
| download | podman-8ed517576cc185ddfa5d2e3af9c034e9ae375841.tar.gz podman-8ed517576cc185ddfa5d2e3af9c034e9ae375841.tar.bz2 podman-8ed517576cc185ddfa5d2e3af9c034e9ae375841.zip | |
Merge pull request #14118 from rhatdan/VENDOR
Vendor in containers/buildah@v1.26.1
Diffstat (limited to 'vendor/github.com/openshift/imagebuilder')
| -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 |