projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12308: Merge branch 'master'
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvcontainer.py
diff --git
a/sdk/cwl/arvados_cwl/arvcontainer.py
b/sdk/cwl/arvados_cwl/arvcontainer.py
index aa3388d00bc9964eb8eb845f2210ac6eee6510de..2b55ce9df5afa6b4a5e7d98ded954be50ae40aa0 100644
(file)
--- 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 .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')
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, 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,
container_request["container_image"] = arv_docker_get_image(self.arvrunner.api,
docker_req,
@@
-425,7
+426,7
@@
class RunnerContainer(Runner):
"ram": 1024*1024 * (math.ceil(self.submit_runner_ram) + math.ceil(self.collection_cache_size)),
"API": True
},
"ram": 1024*1024 * (math.ceil(self.submit_runner_ram) + math.ceil(self.collection_cache_size)),
"API": True
},
- "use_existing":
self.enable_reuse,
+ "use_existing":
False, # Never reuse the runner container - see #15497.
"properties": {}
}
"properties": {}
}