opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12341 from natefoo/fix-empty-container-volumes

Browse Source 
[21.05] Fix for empty docker_volumes/singularity_volumes in job config
This commit is contained in:
John Chilton
2021-08-13 10:13:16 -04:00
committed by GitHub
parent ba6c716250 ed53b05f61
commit 2ec9f5b1f8
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tool_util/deps/container_classes.py
+7
View File
@@ -117,6 +117,10 @@ def preprocess_volumes(volumes_raw_str, container_type):
ro for Singularity iff no subdirectories are rw (Singularity does not allow ro
parent directories with rw subdirectories).
>>> preprocess_volumes(None, DOCKER_CONTAINER_TYPE)
[]
>>> preprocess_volumes("", DOCKER_CONTAINER_TYPE)
[]
>>> preprocess_volumes("/a/b", DOCKER_CONTAINER_TYPE)
['/a/b:rw']
>>> preprocess_volumes("/a/b:ro,/a/b/c:rw", DOCKER_CONTAINER_TYPE)
@@ -131,6 +135,9 @@ def preprocess_volumes(volumes_raw_str, container_type):
['/a/b', '/a/b/c']
"""
if not volumes_raw_str:
return []
volumes_raw_strs = [v.strip() for v in volumes_raw_str.split(",")]
volumes = []
rw_paths = []