fix(builder): send nil to controller, not 'False'

deis · Dec 8, 2014 · 1e8c17b · 1e8c17b
1 parent d8b8343
commit 1e8c17b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/builder/bin/generate-buildhook.go b/builder/bin/generate-buildhook.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"strconv"
 
 	"github.com/deis/deis/builder"
 )
@@ -29,8 +28,10 @@ func main() {
 	var procfile builder.ProcessType
 	assert(json.Unmarshal([]byte(os.Args[5]), &procfile))
 
-	dockerfile, err := strconv.ParseBool(os.Args[6])
-	assert(err)
+	var dockerfile string = os.Args[6]
+	if dockerfile == "false" {
+		dockerfile = ""
+	}
 
 	buildHook := builder.BuildHook{
 		Sha:         os.Args[1],

diff --git a/builder/types.go b/builder/types.go
@@ -27,7 +27,7 @@ type BuildHook struct {
 	ReceiveRepo string      `json:"receive_repo"`
 	Image       string      `json:"image"`
 	Procfile    ProcessType `json:"procfile"`
-	Dockerfile  bool        `json:"dockerfile"`
+	Dockerfile  string      `json:"dockerfile"`
 }
 
 // BuildHookResponse represents a controller's build-hook response object.