chore(controller): use sh env

Author: duanhongyi

rootfs/api/models/app.py

@@ -130,18 +130,33 @@ def _get_command(self, container_type):
             if release.build.dockerfile or not release.build.sha:
                 # has profile
                 if release.build.procfile and container_type in release.build.procfile:
-                    return release.build.procfile[container_type].split()
+                    cmd = 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 [cmd]
+                    else:
+                        return cmd.split()
         return []
 
+    def _get_stack(self, release):
+        stack = release.config.values.get("DRYCC_STACK", None)
+        if stack is None:
+            if release.build.procfile \
+                    and release.build.sha \
+                    and not release.build.dockerfile:
+                stack = "buildpack"
+            else:
+                stack = "container"
+        return stack
+
     def _get_entrypoint(self, container_type):
         """
         Return the kubernetes "container command" to be sent off to the scheduler.
         """
-        entrypoint = []
+        entrypoint = ['/bin/sh', '-c']
         release = self.release_set.filter(failed=False).latest()
-        if release.build.procfile \
-                and release.build.sha \
-                and not release.build.dockerfile:
+        if self._get_stack(release) == "buildpack":
             if container_type in release.build.procfile:
                 entrypoint = [container_type]
             else:

rootfs/api/tests/test_pods.py

@@ -521,22 +521,22 @@ def test_command_good(self, mock_requests):
         # switch to docker 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'), [])
-        self.assertEqual(app._get_command('cmd'), ["node", "server.js"])
-        self.assertEqual(app._get_entrypoint('worker'), [])
-        self.assertEqual(app._get_command('worker'), ["node", "worker.js"])
+        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'])
 
         # for backwards compatibility if no Procfile is supplied
         build.procfile = {}
@@ -577,7 +577,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'), [])
+        self.assertEqual(app._get_entrypoint('web'), ['/bin/sh', '-c'])
 
         # docker image workflow
         build.dockerfile = ''
@@ -588,7 +588,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('cmd'), [])
+        self.assertEqual(app._get_entrypoint('cmd'), ['/bin/sh', '-c'])
 
         # procfile workflow
         build.sha = 'somereallylongsha'
@@ -637,7 +637,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'), [])
+        self.assertEqual(app._get_entrypoint('web'), ['/bin/sh', '-c'])
 
     def test_scaling_does_not_add_run_proctypes_to_structure(self, mock_requests):
         """Test that app info doesn't show transient "run" proctypes."""