X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ef6f7202858cba65e06cc1a32d52ee2305687bc8..cc3857d9fdcd7588af329a9b2452e0ef09eb68a4:/sdk/cwl/arvados_cwl/runner.py

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 054d3530cf..49d37ebd5a 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -18,6 +18,7 @@ import ruamel.yaml as yaml
 
 from .arvdocker import arv_docker_get_image
 from .pathmapper import ArvPathMapper
+from ._version import __version__
 
 logger = logging.getLogger('arvados.cwl-runner')
 
@@ -129,13 +130,18 @@ def upload_instance(arvrunner, name, tool, job_order):
                                         job_order.get("id", "#"),
                                         False)
 
-        adjustDirObjs(job_order, trim_listing)
-
         if "id" in job_order:
             del job_order["id"]
 
         return workflowmapper
 
+def arvados_jobs_image(arvrunner):
+    img = "arvados/jobs:"+__version__
+    try:
+        arv_docker_get_image(arvrunner.api, {"dockerPull": img}, True, arvrunner.project_uuid)
+    except Exception as e:
+        raise Exception("Docker image %s is not available\n%s" % (img, e) )
+    return img
 
 class Runner(object):
     def __init__(self, runner, tool, job_order, enable_reuse, output_name):
@@ -153,7 +159,9 @@ class Runner(object):
 
     def arvados_job_spec(self, *args, **kwargs):
         self.name = os.path.basename(self.tool.tool["id"])
-        return upload_instance(self.arvrunner, self.name, self.tool, self.job_order)
+        workflowmapper = upload_instance(self.arvrunner, self.name, self.tool, self.job_order)
+        adjustDirObjs(self.job_order, trim_listing)
+        return workflowmapper
 
     def done(self, record):
         if record["state"] == "Complete":