16072: Default image is runner image version, not latest
authorPeter Amstutz <peter.amstutz@curii.com>
Thu, 23 Jan 2020 16:54:42 +0000 (11:54 -0500)
committerPeter Amstutz <peter.amstutz@curii.com>
Thu, 23 Jan 2020 18:52:49 +0000 (13:52 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

sdk/cwl/arvados_cwl/arvcontainer.py

index 52ab2ca4bb5be9e3bca421349eea8bd2ffa28129..2b55ce9df5afa6b4a5e7d98ded954be50ae40aa0 100644 (file)
@@ -33,6 +33,7 @@ from .runner import Runner, arvados_jobs_image, packed_workflow, trim_anonymous_
 from .fsaccess import CollectionFetcher
 from .pathmapper import NoFollowPathMapper, trim_listing
 from .perf import Perf
+from ._version import __version__
 
 logger = logging.getLogger('arvados.cwl-runner')
 metrics = logging.getLogger('arvados.cwl-runner.metrics')
@@ -218,7 +219,7 @@ class ArvadosContainer(JobBase):
 
         (docker_req, docker_is_req) = self.get_requirement("DockerRequirement")
         if not docker_req:
-            docker_req = {"dockerImageId": "arvados/jobs"}
+            docker_req = {"dockerImageId": "arvados/jobs:"+__version__}
 
         container_request["container_image"] = arv_docker_get_image(self.arvrunner.api,
                                                                     docker_req,