Merge pull request #2664 from bacongobbler/revert-to-bash

revert to /bin/bash for run commands

Author: Matthew Fisher

controller/api/models.py

@@ -476,7 +476,7 @@ def run(self, command):
                                    'to run this command')
         image = self.release.image
         job_id = self._job_id
-        entrypoint = '/bin/sh'
+        entrypoint = '/bin/bash'
         # if this is a procfile-based app, switch the entrypoint to slugrunner's default
         # FIXME: remove slugrunner's hardcoded entrypoint
         if self.release.build.procfile and \

controller/api/tests/test_container.py

@@ -499,12 +499,12 @@ def test_run_command_good(self):
                                      num=1)
         rc, output = c.run('echo hi')
         self.assertEqual(rc, 0)
-        self.assertEqual(json.loads(output)['entrypoint'], '/bin/sh')
+        self.assertEqual(json.loads(output)['entrypoint'], '/bin/bash')
         # docker image workflow
         build.dockerfile = None
         build.sha = None
         rc, output = c.run('echo hi')
-        self.assertEqual(json.loads(output)['entrypoint'], '/bin/sh')
+        self.assertEqual(json.loads(output)['entrypoint'], '/bin/bash')
         # procfile workflow
         build.sha = 'somereallylongsha'
         rc, output = c.run('echo hi')

docs/contributing/testing.rst

@@ -96,7 +96,7 @@ test-integration.sh
     >>> Preparing test environment <<<
 
     DEIS_ROOT=/Users/matt/Projects/src/github.com/deis/deis
-    DEIS_TEST_APP=example-dockerfile-http
+    DEIS_TEST_APP=example-go
     ...
     >>> Running integration suite <<<
 

tests/bin/test-setup.sh

@@ -18,7 +18,7 @@ echo "DEIS_ROOT=$DEIS_ROOT"
 export PATH=${GOPATH}/bin:$PATH
 
 # the application under test
-export DEIS_TEST_APP=${DEIS_TEST_APP:-example-dockerfile-http}
+export DEIS_TEST_APP=${DEIS_TEST_APP:-example-go}
 echo "DEIS_TEST_APP=$DEIS_TEST_APP"
 
 # SSH key name used for testing

tests/utils/itutils.go

@@ -312,7 +312,6 @@ func GetRandomApp() string {
 		"example-python-flask",
 		"example-ruby-sinatra",
 		"example-scala",
-		"example-dockerfile-http",
 	}
 	return apps[rand.Intn(len(apps))]
 }