Skip to content

Commit 4f92caf

Browse files
author
Matthew Fisher
committed
Revert "feat(controller): make Procfile mandatory"
This reverts commit b81f4a8.
1 parent c34b6ac commit 4f92caf

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

builder/templates/builder

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ if __name__ == '__main__':
5858
# check for Procfile
5959
dockerfile = os.path.join(temp_dir, 'Dockerfile')
6060
procfile = os.path.join(temp_dir, 'Procfile')
61-
if not os.path.exists(procfile):
62-
raise Exception('Procfile must exist')
63-
if not os.path.exists(dockerfile):
61+
if not os.path.exists(dockerfile) and os.path.exists(procfile):
6462
if os.path.exists('/buildpacks'):
6563
build_cmd = "docker run -i -a stdin -v {cache_dir}:/tmp/cache:rw -v /buildpacks:/tmp/buildpacks deis/slugbuilder".format(**locals())
6664
else:

controller/api/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def _get_scheduler(self):
258258
def _get_command(self):
259259
c_type = self.type
260260
if c_type:
261-
return "cat Procfile | grep ^{c_type} | cut -f 1 -d ' ' --complement | sh -"
261+
return 'start {c_type}'
262262
else:
263263
return ''
264264

0 commit comments

Comments
 (0)