Merge pull request #1985 from johanneswuerbach/run-env

fix(controller): Use correct entrypoint for run

Author: Matthew Fisher

controller/api/models.py

@@ -496,8 +496,14 @@ def run(self, command):
         """Run a one-off command"""
         image = self.release.image + ':v' + str(self.release.version)
         job_id = self._job_id
+        entrypoint = '/bin/bash'
+        if self.release.build.procfile:
+            entrypoint = '/runner/init'
+            command = "'{}'".format(command)
+        else:
+            command = "-c '{}'".format(command)
         try:
-            rc, output = self._scheduler.run(job_id, image, command)
+            rc, output = self._scheduler.run(job_id, image, entrypoint, command)
             return rc, output
         except Exception as e:
             err = '{} (run): {}'.format(job_id, e)

controller/scheduler/chaos.py

@@ -54,7 +54,7 @@ def destroy(self, name):
             raise RuntimeError
         return True
 
-    def run(self, name, image, command):
+    def run(self, name, image, entrypoint, command):
         """
         Run a one-off command
         """

controller/scheduler/coreos.py

@@ -122,6 +122,10 @@ def _create_container(self, name, image, command, unit, **kwargs):
             l.update({'cpu': '-c {}'.format(cpu)})
         else:
             l.update({'cpu': ''})
+        # should a special entrypoint be used
+        entrypoint = kwargs.get('entrypoint')
+        if entrypoint:
+            l.update({'entrypoint': '{}'.format(entrypoint)})
         # construct unit from template
         for f in unit:
             f['value'] = f['value'].format(**l)
@@ -194,9 +198,10 @@ def _destroy_container(self, name):
     def _destroy_log(self, name):
         return self._delete_unit(name+'-log')
 
-    def run(self, name, image, command):  # noqa
+    def run(self, name, image, entrypoint, command):  # noqa
         """Run a one-off command"""
-        self._create_container(name, image, command, copy.deepcopy(RUN_TEMPLATE))
+        self._create_container(name, image, command, copy.deepcopy(RUN_TEMPLATE),
+                               entrypoint=entrypoint)
 
         # wait for the container to get scheduled
         for _ in range(30):
@@ -316,6 +321,6 @@ def attach(self, name):
     {"section": "Unit", "name": "Description", "value": "{name} admin command"},
     {"section": "Service", "name": "ExecStartPre", "value": '''/bin/sh -c "IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker pull $IMAGE"'''},  # noqa
     {"section": "Service", "name": "ExecStartPre", "value": '''/bin/sh -c "docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true"'''},  # noqa
-    {"section": "Service", "name": "ExecStart", "value": '''/bin/sh -c "IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker run --name {name} --entrypoint=/bin/bash -a stdout -a stderr $IMAGE -c '{command}'"'''},  # noqa
+    {"section": "Service", "name": "ExecStart", "value": '''/bin/sh -c "IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker run --name {name} --entrypoint={entrypoint} -a stdout -a stderr $IMAGE {command}"'''},  # noqa
     {"section": "Service", "name": "TimeoutStartSec", "value": "20m"},
 ]

controller/scheduler/mock.py

@@ -44,7 +44,7 @@ def destroy(self, name):
         """
         return
 
-    def run(self, name, image, command):
+    def run(self, name, image, entrypoint, command):
         """
         Run a one-off command
         """