Merge branch 'devel/fixes' into 'master'

Implement two feature requests

See merge request !20

docs/zapps/zapp_format.rst

@@ -143,6 +143,20 @@ number
 
 Relative ordering for service startup. Zoe will start first services with a lower value. Note that Zoe will not wait for the service to be up and running before starting the next in the list.
 
+command
+^^^^^^^
+
+string or null
+
+Overrides the command to execute inside the service container. If set to null, the command set at image creation time will be executed.
+
+work_dir
+^^^^^^^^
+
+string
+
+This entry is optional. If set, its value will be used as the work directory where the command is executed.
+
 ports
 ^^^^^
 

schemas/app_description_schema.json

@@ -142,6 +142,9 @@
             { "type": "string", "minLength": 1 },
             { "type": "null" }
           ]
+        },
+        "work_dir": {
+          "type": "string", "minLength": 1
         }
       },
       "additionalProperties": false,

zoe_api/web/templates/status.html

@@ -21,7 +21,7 @@
     <div class="scheduler_queue">
     {% for id in stats['queue'] %}
         <div class="queue_item" id="{{ id }}">
-            <a href="{{ reverse_url('execution_inspect', id) }}">{{ id }}</a>
+            <a href="{{ reverse_url('execution_inspect', id) }}">{{ id }}</a> ({{ executions_in_queue[id].user_id }})
             {% for service in executions_in_queue[id].services %}
                 {% if service.essential %}
                 <div class="service essential {{ 'running' if service.status == service.ACTIVE_STATUS }}">
@@ -52,7 +52,7 @@
     <div class="scheduler_queue">
     {% for id in stats['running_queue'] %}
                 <div class="queue_item" id="{{ id }}">
-            <a href="{{ reverse_url('execution_inspect', id) }}">{{ id }}</a>
+            <a href="{{ reverse_url('execution_inspect', id) }}">{{ id }}</a> ({{ executions_in_queue[id].user_id }})
             {% for service in executions_in_queue[id].services %}
                 {% if service.essential %}
                 <div class="service essential {{ 'running' if service.status == service.ACTIVE_STATUS }}">

zoe_lib/state/service.py

@@ -141,6 +141,11 @@ class Service:
         except KeyError:
             self.command = None
 
+        try:
+            self.work_dir = self.description['work_dir']
+        except KeyError:
+            self.work_dir = None
+
         try:
             self.resource_reservation = ResourceReservation(self.description['resources'])
         except KeyError:

zoe_master/backends/service_instance.py

@@ -60,6 +60,8 @@ class ServiceInstance:
 
         self.command = service.command
 
+        self.work_dir = service.work_dir
+
         self.image_name = service.image_name
 
         self.ports = []

zoe_master/backends/swarm/api_client.py

@@ -209,6 +209,7 @@ class SwarmClient:
                                            network_disabled=False,
                                            network_mode=get_conf().overlay_network_name,
                                            ports=port_bindings,
+                                           working_dir=service_instance.work_dir,
                                            volumes=volumes)
         except docker.errors.ImageNotFound:
             raise ZoeException(message='Image not found')