Merge pull request #353 from kmala/bug

fix(proctype):deploy dockerfile app with procfile

Author: kmala

pkg/gitreceive/build.go

@@ -232,10 +232,8 @@ func build(
 	log.Debug("Done")
 
 	procType := pkg.ProcessType{}
-	if bType == buildTypeProcfile {
-		if procType, err = getProcFile(storageDriver, tmpDir, slugBuilderInfo.AbsoluteProcfileKey()); err != nil {
-			return err
-		}
+	if procType, err = getProcFile(storageDriver, tmpDir, slugBuilderInfo.AbsoluteProcfileKey(), bType); err != nil {
+		return err
 	}
 
 	log.Info("Build complete.")
@@ -275,7 +273,7 @@ func prettyPrintJSON(data interface{}) (string, error) {
 	return string(formatted.Bytes()), nil
 }
 
-func getProcFile(getter storage.ObjectGetter, dirName, procfileKey string) (pkg.ProcessType, error) {
+func getProcFile(getter storage.ObjectGetter, dirName, procfileKey string, bType buildType) (pkg.ProcessType, error) {
 	procType := pkg.ProcessType{}
 	if _, err := os.Stat(fmt.Sprintf("%s/Procfile", dirName)); err == nil {
 		rawProcFile, err := ioutil.ReadFile(fmt.Sprintf("%s/Procfile", dirName))
@@ -287,6 +285,9 @@ func getProcFile(getter storage.ObjectGetter, dirName, procfileKey string) (pkg.
 		}
 		return procType, nil
 	}
+	if bType != buildTypeProcfile {
+		return procType, nil
+	}
 	log.Debug("Procfile not present. Getting it from the buildpack")
 	rawProcFile, err := getter.GetContent(context.Background(), procfileKey)
 	if err != nil {

pkg/gitreceive/build_test.go

@@ -34,7 +34,7 @@ func TestGetProcFileFromRepoSuccess(t *testing.T) {
 		}
 	}()
 	getter := &storage.FakeObjectGetter{}
-	procType, err := getProcFile(getter, tmpDir, objKey)
+	procType, err := getProcFile(getter, tmpDir, objKey, buildTypeProcfile)
 	actualData := pkg.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
 	assert.NoErr(t, err)
@@ -56,7 +56,7 @@ func TestGetProcFileFromRepoFailure(t *testing.T) {
 		}
 	}()
 	getter := &storage.FakeObjectGetter{}
-	_, err = getProcFile(getter, tmpDir, objKey)
+	_, err = getProcFile(getter, tmpDir, objKey, buildTypeProcfile)
 
 	assert.True(t, err != nil, "no error received when there should have been")
 }
@@ -69,7 +69,7 @@ func TestGetProcFileFromServerSuccess(t *testing.T) {
 		},
 	}
 
-	procType, err := getProcFile(getter, "", objKey)
+	procType, err := getProcFile(getter, "", objKey, buildTypeProcfile)
 	actualData := pkg.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
 	assert.NoErr(t, err)
@@ -84,7 +84,7 @@ func TestGetProcFileFromServerFailure(t *testing.T) {
 		},
 	}
 
-	_, err := getProcFile(getter, "", objKey)
+	_, err := getProcFile(getter, "", objKey, buildTypeProcfile)
 	assert.Err(t, err, fmt.Errorf("error in reading %s (%s)", objKey, expectedErr))
 	assert.True(t, err != nil, "no error received when there should have been")
 }