Skip to content

Commit 80f72d3

Browse files
add option to specify container resolver config file
1 parent 88994e6 commit 80f72d3

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

planemo/galaxy/config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,8 @@ def _handle_container_resolution(ctx, kwds, galaxy_properties):
13941394
involucro_context = build_involucro_context(ctx, **kwds)
13951395
galaxy_properties["involucro_auto_init"] = "False" # Use planemo's
13961396
galaxy_properties["involucro_path"] = involucro_context.involucro_bin
1397-
1397+
if kwds.get("container_resolvers_config_file"):
1398+
galaxy_properties["container_resolvers_config_file"] = kwds.get("container_resolvers_config_file")
13981399

13991400
def _handle_job_metrics(config_directory, kwds):
14001401
metrics_conf = os.path.join(config_directory, "job_metrics_conf.xml")

planemo/options.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,20 @@ def tool_data_path_option():
416416

417417

418418
def mulled_containers_option():
419-
return planemo_option(
420-
"mulled_containers",
421-
"--mulled_containers",
422-
"--biocontainers",
423-
is_flag=True,
424-
help="Test tools against mulled containers (requires --docker/--singularity, if none of these are given --docker is used automatically). Disables conda resolution unless any conda option has been set explicitly.",
419+
return _compose(
420+
planemo_option(
421+
"mulled_containers",
422+
"--mulled_containers",
423+
"--biocontainers",
424+
is_flag=True,
425+
help="Test tools against mulled containers (requires --docker/--singularity, if none of these are given --docker is used automatically). Disables conda resolution unless any conda option has been set explicitly.",
426+
),
427+
planemo_option(
428+
"--container_resolvers_config_file",
429+
type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True),
430+
help="Container resolver config file",
431+
default=None,
432+
),
425433
)
426434

427435

0 commit comments

Comments
 (0)