summaryrefslogtreecommitdiff
path: root/cmd/podman/images
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-02-08 14:26:51 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2021-02-08 16:02:20 -0500
commit45981ba29ae75ec328bfd14018ec4ada52e7f189 (patch)
treebc9af98e3debada941cd025dfbb7a3ac490c6706 /cmd/podman/images
parent19507d0ffe8cda0a69f056838556f471fd9e61fa (diff)
downloadpodman-45981ba29ae75ec328bfd14018ec4ada52e7f189.tar.gz
podman-45981ba29ae75ec328bfd14018ec4ada52e7f189.tar.bz2
podman-45981ba29ae75ec328bfd14018ec4ada52e7f189.zip
Bump containers/buildah to v1.19.4
Fix handling of --iidfile to happen on the client side. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/images')
-rw-r--r--cmd/podman/images/build.go14
1 files changed, 12 insertions, 2 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 308944ce5..895bdb631 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -264,7 +264,18 @@ func build(cmd *cobra.Command, args []string) error {
return err
}
- _, err = registry.ImageEngine().Build(registry.GetContext(), containerFiles, *apiBuildOpts)
+ report, err := registry.ImageEngine().Build(registry.GetContext(), containerFiles, *apiBuildOpts)
+
+ if cmd.Flag("iidfile").Changed {
+ f, err := os.Create(buildOpts.Iidfile)
+ if err != nil {
+ return err
+ }
+ if _, err := f.WriteString("sha256:" + report.ID); err != nil {
+ return err
+ }
+ }
+
return err
}
@@ -468,7 +479,6 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
ForceRmIntermediateCtrs: flags.ForceRm,
From: flags.From,
IDMappingOptions: idmappingOptions,
- IIDFile: flags.Iidfile,
In: stdin,
Isolation: isolation,
Jobs: &flags.Jobs,