Merge pull request #161 from arschles/fix-slug-url

arschles · arschles · commit 8fd6f2df24de · 2016-02-09T17:09:48.000-08:00
fix(pkg/gitreceive/build.go): send the entire slug URL to the controller
diff --git a/pkg/gitreceive/build.go b/pkg/gitreceive/build.go
@@ -217,6 +217,8 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 	}
 	if !usingDockerfile {
 		buildHook.Dockerfile = ""
+		// need this to tell the controller what URL to give the slug runner
+		buildHook.Image = slugBuilderInfo.PushURL() + "/slug.tgz"
 	} else {
 		buildHook.Dockerfile = "true"
 	}

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,8 @@ func build(conf Config, s3Client s3.S3, kubeClient *client.Client, builderKey,`
`217`	`217`	`}`
`218`	`218`	`if !usingDockerfile {`
`219`	`219`	`buildHook.Dockerfile = ""`
	`220`	`+ // need this to tell the controller what URL to give the slug runner`
	`221`	`+ buildHook.Image = slugBuilderInfo.PushURL() + "/slug.tgz"`
`220`	`222`	`} else {`
`221`	`223`	`buildHook.Dockerfile = "true"`
`222`	`224`	`}`