diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-05 15:40:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 15:40:19 -0400 |
| commit | 83ef2c721ad438256b136b3491e504a6e70b64c9 (patch) | |
| tree | f6de5a7db4fb79801d607eb4c1fb0c1553341b90 /cmd | |
| parent | 8081d921b2bf39a418155a6822e55f3392ad63f6 (diff) | |
| parent | d57bbdb5cd24966a4a6f01dbdea6b17a6ef2965b (diff) | |
| download | podman-83ef2c721ad438256b136b3491e504a6e70b64c9.tar.gz podman-83ef2c721ad438256b136b3491e504a6e70b64c9.tar.bz2 podman-83ef2c721ad438256b136b3491e504a6e70b64c9.zip | |
Merge pull request #14127 from rhatdan/v4.1
Vendor in containers/buildah@v1.26.1
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/images/build.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 1f9e7ea9e..3ea60e18a 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -190,6 +190,7 @@ func buildFlags(cmd *cobra.Command) { _ = flags.MarkHidden("tls-verify") _ = flags.MarkHidden("compress") _ = flags.MarkHidden("volume") + _ = flags.MarkHidden("output") } } @@ -201,6 +202,10 @@ func build(cmd *cobra.Command, args []string) error { return errors.New("cannot specify --squash, --squash-all and --layers options together") } + if cmd.Flag("output").Changed && registry.IsRemote() { + return errors.New("'--output' option is not supported in remote mode") + } + // Extract container files from the CLI (i.e., --file/-f) first. var containerFiles []string for _, f := range buildOpts.File { @@ -515,6 +520,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 +528,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 +543,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, |