[ARVADOS] created: 1.3.0-2101-gd6831ca44
Git user
git at public.arvados.org
Thu Jan 23 17:00:28 UTC 2020
at d6831ca44d7dacba7c13d27a858dff29c4286542 (commit)
commit d6831ca44d7dacba7c13d27a858dff29c4286542
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Jan 23 11:54:42 2020 -0500
16072: Default image is runner image version, not latest
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 52ab2ca4b..2b55ce9df 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -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,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list