Skip to content

Commit 430b386

Browse files
author
Matthew Fisher
committed
Revert "ref(controller): use /bin/sh for better portability"
This reverts commit a897ddb.
1 parent fce5e8b commit 430b386

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

controller/api/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ def run(self, command):
476476
'to run this command')
477477
image = self.release.image
478478
job_id = self._job_id
479-
entrypoint = '/bin/sh'
479+
entrypoint = '/bin/bash'
480480
# if this is a procfile-based app, switch the entrypoint to slugrunner's default
481481
# FIXME: remove slugrunner's hardcoded entrypoint
482482
if self.release.build.procfile and \

controller/api/tests/test_container.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,12 +499,12 @@ def test_run_command_good(self):
499499
num=1)
500500
rc, output = c.run('echo hi')
501501
self.assertEqual(rc, 0)
502-
self.assertEqual(json.loads(output)['entrypoint'], '/bin/sh')
502+
self.assertEqual(json.loads(output)['entrypoint'], '/bin/bash')
503503
# docker image workflow
504504
build.dockerfile = None
505505
build.sha = None
506506
rc, output = c.run('echo hi')
507-
self.assertEqual(json.loads(output)['entrypoint'], '/bin/sh')
507+
self.assertEqual(json.loads(output)['entrypoint'], '/bin/bash')
508508
# procfile workflow
509509
build.sha = 'somereallylongsha'
510510
rc, output = c.run('echo hi')

0 commit comments

Comments
 (0)