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 /pkg/bindings | |
| 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 'pkg/bindings')
| -rw-r--r-- | pkg/bindings/images/build.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index 9e0a0d798..51dcd2aa5 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -216,6 +216,12 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO if t := options.Output; len(t) > 0 { params.Set("output", t) } + if t := options.OSVersion; len(t) > 0 { + params.Set("osversion", t) + } + for _, t := range options.OSFeatures { + params.Set("osfeature", t) + } var platform string if len(options.OS) > 0 { platform = options.OS @@ -303,6 +309,10 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO params.Set("ulimits", string(ulimitsJSON)) } + for _, env := range options.Envs { + params.Add("setenv", env) + } + for _, uenv := range options.UnsetEnvs { params.Add("unsetenv", uenv) } |