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 /cmd/podman/images | |
| 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 'cmd/podman/images')
| -rw-r--r-- | cmd/podman/images/build.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 1f9e7ea9e..1ceb63684 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -515,6 +515,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil Annotations: flags.Annotation, Args: args, BlobDirectory: flags.BlobCache, + BuildOutput: flags.BuildOutput, CommonBuildOpts: commonOpts, Compression: compression, ConfigureNetwork: networkPolicy, @@ -522,6 +523,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil DefaultMountsFilePath: containerConfig.Containers.DefaultMountsFile, Devices: flags.Devices, DropCapabilities: flags.CapDrop, + Envs: flags.Envs, Err: stderr, ForceRmIntermediateCtrs: flags.ForceRm, From: flags.From, @@ -536,6 +538,8 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil MaxPullPushRetries: 3, NamespaceOptions: nsValues, NoCache: flags.NoCache, + OSFeatures: flags.OSFeatures, + OSVersion: flags.OSVersion, OciDecryptConfig: decConfig, Out: stdout, Output: output, |