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 /cmd | |
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 'cmd')
-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, |