feat(dockerbuilder): add logic to build dockerfile builds

Author: smothiki

pkg/gitreceive/build.go

@@ -54,11 +54,14 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 	buildDir := filepath.Join(repoDir, "build")
 
 	slugName := fmt.Sprintf("%s:git-%s", appName, gitSha.Short())
-	imageName := strings.Replace(slugName, ":", "-", -1)
 	if err := os.MkdirAll(buildDir, os.ModeDir); err != nil {
 		return fmt.Errorf("making the build directory %s (%s)", buildDir, err)
 	}
-	tmpDir := os.TempDir()
+
+	tmpDir, err := ioutil.TempDir(buildDir, "tmp")
+	if err != nil {
+		return fmt.Errorf("unable to create tmpdir %s (%s)", buildDir, err)
+	}
 
 	slugBuilderInfo := storage.NewSlugBuilderInfo(s3Client.Endpoint, appName, slugName, gitSha)
 
@@ -78,7 +81,7 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 
 	// build a tarball from the new objects
 	appTgz := fmt.Sprintf("%s.tar.gz", appName)
-	gitArchiveCmd := repoCmd(repoDir, "git", "archive", "--format=tar.gz", fmt.Sprintf("--output=%s", appTgz), gitSha.Full())
+	gitArchiveCmd := repoCmd(repoDir, "git", "archive", "--format=tar.gz", fmt.Sprintf("--output=%s", appTgz), gitSha.Short())
 	gitArchiveCmd.Stdout = os.Stdout
 	gitArchiveCmd.Stderr = os.Stderr
 	if err := run(gitArchiveCmd); err != nil {
@@ -97,7 +100,7 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 	bType := getBuildTypeForDir(tmpDir)
 	usingDockerfile := bType == buildTypeDockerfile
 
-	var procType pkg.ProcessType
+	procType := pkg.ProcessType{}
 	if bType == buildTypeProcfile {
 		rawProcFile, err := ioutil.ReadFile(fmt.Sprintf("%s/Procfile", tmpDir))
 		if err != nil {
@@ -136,7 +139,7 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 			conf.PodNamespace,
 			appConf.Values,
 			slugBuilderInfo.TarURL(),
-			imageName,
+			slugName,
 		)
 	} else {
 		buildPodName = slugBuilderPodName(appName, gitSha.Short())
@@ -201,13 +204,12 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 	if err != nil {
 		return fmt.Errorf("Timed out waiting for object in storage. Aborting build...")
 	}
-
 	log.Info("Build complete.")
 	log.Info("Launching app.")
 	log.Info("Launching...")
 
 	buildHook := &pkg.BuildHook{
-		Sha:         gitSha.Full(),
+		Sha:         gitSha.Short(),
 		ReceiveUser: conf.Username,
 		ReceiveRepo: appName,
 		Image:       appName,
@@ -217,7 +219,6 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 		buildHook.Dockerfile = ""
 	} else {
 		buildHook.Dockerfile = "true"
-		buildHook.Image = imageName
 	}
 	buildHookResp, err := publishRelease(conf, builderKey, buildHook)
 	if err != nil {

pkg/gitreceive/k8s_util.go

@@ -12,10 +12,11 @@ import (
 )
 
 const (
-	slugBuilderName    = "deis-slugbuilder"
-	slugBuilderImage   = "quay.io/deisci/slugbuilder:v2-beta"
-	dockerBuilderName  = "deis-dockerbuilder"
-	dockerBuilderImage = "quay.io/deisci/dockerbuilder:v2-beta"
+	slugBuilderName   = "deis-slugbuilder"
+	slugBuilderImage  = "quay.io/deisci/slugbuilder:v2-beta"
+	dockerBuilderName = "deis-dockerbuilder"
+	// change the value back to quay.io/deisci/dockerbuilder:v2-beta
+	dockerBuilderImage = "smothiki/dockerbuilder:v1.8"
 
 	tarURLKey        = "TAR_URL"
 	putURLKey        = "put_url"
@@ -44,10 +45,8 @@ func dockerBuilderPod(debug, withAuth bool, name, namespace string, env map[stri
 	addEnvToPod(pod, "ACCESS_KEY_FILE", "/var/run/secrets/object/store/access_key")
 	addEnvToPod(pod, "ACCESS_SECRET_FILE", "/var/run/secrets/object/store/access_secret")
 
-	if !withAuth {
-		addEnvToPod(pod, tarURLKey, tarURL)
-		addEnvToPod(pod, "IMG_NAME", imageName)
-	}
+	addEnvToPod(pod, tarURLKey, tarURL)
+	addEnvToPod(pod, "IMG_NAME", imageName)
 
 	pod.Spec.Containers[0].VolumeMounts = append(pod.Spec.Containers[0].VolumeMounts, api.VolumeMount{
 		Name:      dockerSocketName,

pkg/gitreceive/storage/slug_builder_info.go

@@ -18,7 +18,7 @@ type SlugBuilderInfo struct {
 func NewSlugBuilderInfo(s3Endpoint, appName, slugName string, gitSha *git.SHA) *SlugBuilderInfo {
 	tarKey := fmt.Sprintf("home/%s/tar", slugName)
 	// this is where workflow tells slugrunner to download the slug from, so we have to tell slugbuilder to upload it to here
-	pushKey := fmt.Sprintf("home/%s:git-%s/push", appName, gitSha.Full())
+	pushKey := fmt.Sprintf("home/%s:git-%s/push", appName, gitSha.Short())
 
 	return &SlugBuilderInfo{
 		pushKey: pushKey,

pkg/gitreceive/storage/slug_builder_info_test.go

@@ -36,7 +36,7 @@ func TestPushKey(t *testing.T) {
 		t.Fatalf("error building git sha (%s)", err)
 	}
 	sbi := NewSlugBuilderInfo(s3Endpoint, appName, slugName, sha)
-	expectedPushKey := "home/" + appName + ":git-" + sha.Full() + "/push"
+	expectedPushKey := "home/" + appName + ":git-" + sha.Short() + "/push"
 	if sbi.PushKey() != expectedPushKey {
 		t.Errorf("push key %s didn't match expected %s", sbi.PushKey(), expectedPushKey)
 	}