Skip to content

Commit 1e8c17b

Browse files
author
Matthew Fisher
committed
fix(builder): send nil to controller, not 'False'
1 parent d8b8343 commit 1e8c17b

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

builder/bin/generate-buildhook.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"encoding/json"
55
"fmt"
66
"os"
7-
"strconv"
87

98
"github.com/deis/deis/builder"
109
)
@@ -29,8 +28,10 @@ func main() {
2928
var procfile builder.ProcessType
3029
assert(json.Unmarshal([]byte(os.Args[5]), &procfile))
3130

32-
dockerfile, err := strconv.ParseBool(os.Args[6])
33-
assert(err)
31+
var dockerfile string = os.Args[6]
32+
if dockerfile == "false" {
33+
dockerfile = ""
34+
}
3435

3536
buildHook := builder.BuildHook{
3637
Sha: os.Args[1],

builder/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type BuildHook struct {
2727
ReceiveRepo string `json:"receive_repo"`
2828
Image string `json:"image"`
2929
Procfile ProcessType `json:"procfile"`
30-
Dockerfile bool `json:"dockerfile"`
30+
Dockerfile string `json:"dockerfile"`
3131
}
3232

3333
// BuildHookResponse represents a controller's build-hook response object.

0 commit comments

Comments
 (0)