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

Move base_image_for_targets to when we actually need it

Browse Source 
This avoids the check for builds that already exist
This commit is contained in:
mvdbeek
2020-01-17 09:19:52 +01:00
parent b1885b065f
commit 44efbb5400
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tool_util/deps/mulled/mulled_build.py
+7 -9
View File
@@ -181,13 +181,6 @@ def mull_targets(
oauth_token=None, hash_func="v2", singularity=False,
singularity_image_dir="singularity_import", base_image=None,
):
if base_image:
dest_base_image = base_image
elif DEST_BASE_IMAGE:
dest_base_image = DEST_BASE_IMAGE
else:
dest_base_image = base_image_for_targets(targets)
targets = list(targets)
if involucro_context is None:
involucro_context = InvolucroContext()
@@ -237,9 +230,14 @@ def mull_targets(
'-set', "REPO='%s'" % repo,
'-set', "BINDS='%s'" % bind_str,
]
if base_image:
dest_base_image = base_image
elif DEST_BASE_IMAGE:
dest_base_image = DEST_BASE_IMAGE
else:
dest_base_image = base_image_for_targets(targets)
if dest_base_image:
involucro_args.extend(["-set", "DEST_BASE_IMAGE='%s'" % dest_base_image])
involucro_args.extend(["-set", "DEST_BASE_IMAGE='%s'" % dest_base_image])
if CONDA_IMAGE:
involucro_args.extend(["-set", "CONDA_IMAGE='%s'" % CONDA_IMAGE])
if verbose: