From 15674d9ee911d31a0e8889c78d00eb0154f09103 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Sat, 9 Jun 2018 01:16:51 +0000 Subject: [PATCH] build: simplify Close logic in WriteTempDockerfile Signed-off-by: Tibor Vass --- cli/command/image/build/context.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cli/command/image/build/context.go b/cli/command/image/build/context.go index eaeac9e195..d3de277415 100644 --- a/cli/command/image/build/context.go +++ b/cli/command/image/build/context.go @@ -111,12 +111,8 @@ func WriteTempDockerfile(rc io.ReadCloser) (string, error) { if err != nil { return "", err } - _, err = io.Copy(f, rc) - if err != nil { - f.Close() - return "", err - } - if err := f.Close(); err != nil { + defer f.Close() + if _, err := io.Copy(f, rc); err != nil { return "", err } return dockerfileDir, rc.Close()