Merge pull request #2642 from bacongobbler/fix-entrypoint

fix(controller): dockerfile entrypoint should use /bin/sh

Author: Matthew Fisher

controller/api/models.py

@@ -476,8 +476,12 @@ def run(self, command):
                                    'to run this command')
         image = self.release.image
         job_id = self._job_id
-        entrypoint = '/bin/bash'
-        if self.release.build.procfile:
+        entrypoint = '/bin/sh'
+        # 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 \
+           self.release.build.sha and not \
+           self.release.build.dockerfile:
             entrypoint = '/runner/init'
             command = "'{}'".format(command)
         else:

controller/api/tests/test_container.py

@@ -468,3 +468,44 @@ def test_command_good(self):
         self.assertEqual(c._command, 'start worker')
         c.type = 'cmd'
         self.assertEqual(c._command, '')
+
+    def test_run_command_good(self):
+        """Test the run command for each container workflow"""
+        url = '/v1/apps'
+        response = self.client.post(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
+        self.assertEqual(response.status_code, 201)
+        app_id = response.data['id']
+        app = App.objects.get(id=app_id)
+        user = User.objects.get(username='autotest')
+        # dockerfile + procfile worflow
+        build = Build.objects.create(owner=user,
+                                     app=app,
+                                     image="qwerty",
+                                     procfile={'web': 'node server.js',
+                                               'worker': 'node worker.js'},
+                                     dockerfile='foo',
+                                     sha='somereallylongsha')
+        # create an initial release
+        release = Release.objects.create(version=2,
+                                         owner=user,
+                                         app=app,
+                                         config=app.config_set.latest(),
+                                         build=build)
+        # create a container
+        c = Container.objects.create(owner=user,
+                                     app=app,
+                                     release=release,
+                                     type='web',
+                                     num=1)
+        rc, output = c.run('echo hi')
+        self.assertEqual(rc, 0)
+        self.assertEqual(json.loads(output)['entrypoint'], '/bin/sh')
+        # docker image workflow
+        build.dockerfile = None
+        build.sha = None
+        rc, output = c.run('echo hi')
+        self.assertEqual(json.loads(output)['entrypoint'], '/bin/sh')
+        # procfile workflow
+        build.sha = 'somereallylongsha'
+        rc, output = c.run('echo hi')
+        self.assertEqual(json.loads(output)['entrypoint'], '/runner/init')

controller/scheduler/mock.py

@@ -1,3 +1,5 @@
+
+import json
 from cStringIO import StringIO
 
 
@@ -39,7 +41,11 @@ def run(self, name, image, entrypoint, command):
         """
         Run a one-off command
         """
-        return 0, ''
+        # dump input into a json object for testing purposes
+        return 0, json.dumps({'name': name,
+                              'image': image,
+                              'entrypoint': entrypoint,
+                              'command': command})
 
     def attach(self, name):
         """