[ARVADOS] updated: e1655f12ed1cfec6b5763e1db81e7ec8dd0f7a14

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

       via  e1655f12ed1cfec6b5763e1db81e7ec8dd0f7a14 (commit)
      from  5450d1417a31aaf2f71e16a440fcfee0a06be6c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e1655f12ed1cfec6b5763e1db81e7ec8dd0f7a14
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 21 20:37:39 2016 -0400

    8654: Upload Docker images

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index e170648..d534abd 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -367,9 +367,17 @@ class ArvCwlRunner(object):
         self.uploaded[src] = pair
 
     def upload_docker(self, tool):
-        pass
+        if isinstance(tool, cwltool.draft2tool.CommandLineTool):
+            (docker_req, docker_is_req) = get_feature(tool, "DockerRequirement")
+            if docker_req:
+                arv_docker_get_image(self.api, docker_req, True, self.project_uuid)
+        elif isinstance(tool, cwltool.workflow.Workflow):
+            for s in tool.steps:
+                self.upload_docker(s.embedded_tool)
 
     def submit(self, tool, job_order, input_basedir, args, **kwargs):
+        self.upload_docker(tool)
+
         workflowfiles = set()
         jobfiles = set()
         workflowfiles.add(tool.tool["id"])

-----------------------------------------------------------------------


hooks/post-receive
--