From 0f2ea23de567983521ce6be8804deda06056af10 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Sun, 17 Jun 2018 11:35:16 -0400 Subject: Add missing functionality for podman build layers Need to pick the values from the flags and send it to buildah for build. Signed-off-by: umohnani8 Closes: #947 Approved by: rhatdan --- cmd/podman/build.go | 56 ++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/cmd/podman/build.go b/cmd/podman/build.go index 14efb16fb..1f05da918 100644 --- a/cmd/podman/build.go +++ b/cmd/podman/build.go @@ -179,32 +179,36 @@ func buildCmd(c *cli.Context) error { namespaceOptions.AddOrReplace(usernsOption...) options := imagebuildah.BuildOptions{ - ContextDirectory: contextDir, - PullPolicy: pullPolicy, - Compression: imagebuildah.Gzip, - Quiet: c.Bool("quiet"), - SignaturePolicyPath: c.String("signature-policy"), - Args: args, - Output: output, - AdditionalTags: tags, - Out: stdout, - Err: stderr, - ReportWriter: reporter, - Runtime: c.String("runtime"), - RuntimeArgs: runtimeFlags, - OutputFormat: format, - SystemContext: systemContext, - NamespaceOptions: namespaceOptions, - ConfigureNetwork: networkPolicy, - CNIPluginPath: c.String("cni-plugin-path"), - CNIConfigDir: c.String("cni-config-dir"), - IDMappingOptions: idmappingOptions, - CommonBuildOpts: commonOpts, - DefaultMountsFilePath: c.GlobalString("default-mounts-file"), - IIDFile: c.String("iidfile"), - Squash: c.Bool("squash"), - Labels: c.StringSlice("label"), - Annotations: c.StringSlice("annotation"), + ContextDirectory: contextDir, + PullPolicy: pullPolicy, + Compression: imagebuildah.Gzip, + Quiet: c.Bool("quiet"), + SignaturePolicyPath: c.String("signature-policy"), + Args: args, + Output: output, + AdditionalTags: tags, + Out: stdout, + Err: stderr, + ReportWriter: reporter, + Runtime: c.String("runtime"), + RuntimeArgs: runtimeFlags, + OutputFormat: format, + SystemContext: systemContext, + NamespaceOptions: namespaceOptions, + ConfigureNetwork: networkPolicy, + CNIPluginPath: c.String("cni-plugin-path"), + CNIConfigDir: c.String("cni-config-dir"), + IDMappingOptions: idmappingOptions, + CommonBuildOpts: commonOpts, + DefaultMountsFilePath: c.GlobalString("default-mounts-file"), + IIDFile: c.String("iidfile"), + Squash: c.Bool("squash"), + Labels: c.StringSlice("label"), + Annotations: c.StringSlice("annotation"), + Layers: c.Bool("layers"), + NoCache: c.Bool("no-cache"), + RemoveIntermediateCtrs: c.BoolT("rm"), + ForceRmIntermediateCtrs: c.Bool("force-rm"), } if !c.Bool("quiet") { -- cgit v1.2.3-54-g00ecf