From 28e685f26efb2b4f18f29e21c2e6a1844dc04174 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 9 Sep 2020 07:11:30 -0400
Subject: Fix podman build --logfile

Currently this command blows up because it closes the file descriptor before
doing the build.

Add tests to make sure we don't regress.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1877188

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/podman/images/build.go | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'cmd/podman/images')

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 400f960cc..923109b15 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -211,7 +211,16 @@ func build(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	apiBuildOpts, err := buildFlagsWrapperToOptions(cmd, contextDir, &buildOpts)
+	var logfile *os.File
+	if cmd.Flag("logfile").Changed {
+		logfile, err = os.OpenFile(buildOpts.Logfile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600)
+		if err != nil {
+			return errors.Errorf("error opening logfile %q: %v", buildOpts.Logfile, err)
+		}
+		defer logfile.Close()
+	}
+
+	apiBuildOpts, err := buildFlagsWrapperToOptions(cmd, contextDir, &buildOpts, logfile)
 	if err != nil {
 		return err
 	}
@@ -225,7 +234,7 @@ func build(cmd *cobra.Command, args []string) error {
 // conversion here prevents the API from doing that (redundantly).
 //
 // TODO: this code should really be in Buildah.
-func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buildFlagsWrapper) (*entities.BuildOptions, error) {
+func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buildFlagsWrapper, logfile *os.File) (*entities.BuildOptions, error) {
 	output := ""
 	tags := []string{}
 	if c.Flag("tag").Changed {
@@ -284,16 +293,11 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 	stderr = os.Stderr
 	reporter = os.Stderr
 
-	if c.Flag("logfile").Changed {
-		f, err := os.OpenFile(flags.Logfile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600)
-		if err != nil {
-			return nil, errors.Errorf("error opening logfile %q: %v", flags.Logfile, err)
-		}
-		defer f.Close()
-		logrus.SetOutput(f)
-		stdout = f
-		stderr = f
-		reporter = f
+	if logfile != nil {
+		logrus.SetOutput(logfile)
+		stdout = logfile
+		stderr = logfile
+		reporter = logfile
 	}
 
 	var memoryLimit, memorySwap int64
-- 
cgit v1.2.3-54-g00ecf