From b8cdb985fdc9143b3a91c1dca7b63b02923c66f7 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 26 May 2017 15:22:12 +0100 Subject: [PATCH] Fix build in directory Remove unnecessary argument to buildInternal function, does not need to know the name. Signed-off-by: Justin Cormack --- cmd/moby/build.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/moby/build.go b/cmd/moby/build.go index db1b68951..3237ef94e 100644 --- a/cmd/moby/build.go +++ b/cmd/moby/build.go @@ -99,10 +99,10 @@ func build(args []string) { log.Fatalf("Invalid config: %v", err) } - image := buildInternal(m, filepath.Join(*buildDir, name), *buildPull) + image := buildInternal(m, *buildPull) log.Infof("Create outputs:") - err = outputs(name, image, buildOut) + err = outputs(filepath.Join(*buildDir, name), image, buildOut) if err != nil { log.Fatalf("Error writing outputs: %v", err) } @@ -156,7 +156,7 @@ func enforceContentTrust(fullImageName string, config *TrustConfig) bool { // Perform the actual build process // TODO return error not panic -func buildInternal(m Moby, name string, pull bool) []byte { +func buildInternal(m Moby, pull bool) []byte { w := new(bytes.Buffer) iw := tar.NewWriter(w)