Merge pull request #834 from deis/procfile-mandatory

feat(controller): make Procfile mandatory

Author: Matthew Fisher

builder/templates/builder

@@ -58,7 +58,9 @@ if __name__ == '__main__':
         # check for Procfile
         dockerfile = os.path.join(temp_dir, 'Dockerfile')
         procfile = os.path.join(temp_dir, 'Procfile')
-        if not os.path.exists(dockerfile) and os.path.exists(procfile):
+        if not os.path.exists(procfile):
+            raise Exception('Procfile must exist')
+        if not os.path.exists(dockerfile):
             if os.path.exists('/buildpacks'):
                 build_cmd = "docker run -i -a stdin -v {cache_dir}:/tmp/cache:rw -v /buildpacks:/tmp/buildpacks deis/slugbuilder".format(**locals())
             else:

controller/api/models.py

@@ -258,7 +258,7 @@ def _get_scheduler(self):
     def _get_command(self):
         c_type = self.type
         if c_type:
-            return 'start {c_type}'
+            return "cat Procfile | grep ^{c_type} | cut -f 1 -d ' ' --complement | sh -"
         else:
             return ''