fix(controller): container entrypoint error

Author: duanhongyi

rootfs/api/models/app.py

@@ -660,12 +660,7 @@ def _get_command(self, container_type):
                 # has profile
                 if release.build.procfile and container_type in release.build.procfile:
                     command = release.build.procfile[container_type]
-                    # if the entrypoint is `/bin/bash -c`, we want to supply the list
-                    # as a script. Otherwise, we want to send it as a list of arguments.
-                    if self._get_entrypoint(container_type) == ['/bin/sh', '-c']:
-                        return [command]
-                    else:
-                        return command.split()
+                    return command.split()
         return []
 
     def _get_stack(self, release):
@@ -685,10 +680,6 @@ def _get_entrypoint(self, container_type):
         """
         entrypoint = []
         release = self.release_set.filter(failed=False).latest()
-        if release is not None and release.build is not None:
-            if (release.build.procfile and container_type in release.build.procfile) \
-                    or container_type == "run":
-                entrypoint = ['/bin/sh', '-c']
         if self._get_stack(release) == "buildpack":
             if container_type in release.build.procfile:
                 entrypoint = [container_type]

rootfs/api/tests/test_pods.py

@@ -522,22 +522,22 @@ def test_command_good(self, mock_requests):
         # switch to container image app
         build.sha = ''
         build.save()
-        self.assertEqual(app._get_command('web'), ['node server.js'])
+        self.assertEqual(app._get_command('web'), ['node', 'server.js'])
 
         # switch to dockerfile app
         build.sha = 'european-swallow'
         build.dockerfile = 'dockerdockerdocker'
         build.save()
-        self.assertEqual(app._get_command('web'), ['node server.js'])
+        self.assertEqual(app._get_command('web'), ['node', 'server.js'])
         self.assertEqual(app._get_command('cmd'), [])
 
         # ensure we can override the cmd process type in a Procfile
         build.procfile['cmd'] = 'node server.js'
         build.save()
-        self.assertEqual(app._get_entrypoint('cmd'), ['/bin/sh', '-c'])
-        self.assertEqual(app._get_command('cmd'), ['node server.js'])
-        self.assertEqual(app._get_entrypoint('worker'), ['/bin/sh', '-c'])
-        self.assertEqual(app._get_command('worker'), ['node worker.js'])
+        self.assertEqual(app._get_entrypoint('cmd'), [])
+        self.assertEqual(app._get_command('cmd'), ['node', 'server.js'])
+        self.assertEqual(app._get_entrypoint('worker'), [])
+        self.assertEqual(app._get_command('worker'), ['node', 'worker.js'])
 
         # for backwards compatibility if no Procfile is supplied
         build.procfile = {}
@@ -578,7 +578,7 @@ def test_run_command_good(self, mock_requests):
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 200, response.data)
         app = App.objects.get(id=app_id)
-        self.assertEqual(app._get_entrypoint('web'), ['/bin/sh', '-c'])
+        self.assertEqual(app._get_entrypoint('web'), [])
 
         # docker image workflow
         build.dockerfile = ''
@@ -590,7 +590,7 @@ def test_run_command_good(self, mock_requests):
         self.assertEqual(response.status_code, 200, response.data)
         app = App.objects.get(id=app_id)
         self.assertEqual(app._get_entrypoint('cmd'), [])
-        self.assertEqual(app._get_entrypoint('run'), ['/bin/sh', '-c'])
+        self.assertEqual(app._get_entrypoint('run'), [])
 
         # procfile workflow
         build.sha = 'somereallylongsha'
@@ -639,7 +639,7 @@ def test_run_not_fail_on_debug(self, mock_requests):
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 200, response.data)
         app = App.objects.get(id=app_id)
-        self.assertEqual(app._get_entrypoint('web'), ['/bin/sh', '-c'])
+        self.assertEqual(app._get_entrypoint('web'), [])
 
     def test_scaling_does_not_add_run_proctypes_to_structure(self, mock_requests):
         """Test that app info doesn't show transient "run" proctypes."""