Skip to content

Commit f6074c3

Browse files
add option to specify container resolver config file
1 parent 6759d00 commit f6074c3

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

planemo/galaxy/config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,6 +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+
if kwds.get("container_resolvers_config_file"):
1398+
galaxy_properties["container_resolvers_config_file"] = kwds.get("container_resolvers_config_file")
13971399

13981400

13991401
def _handle_job_metrics(config_directory, kwds):

planemo/options.py

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

416416

417417
def mulled_containers_option():
418-
return planemo_option(
419-
"mulled_containers",
420-
"--mulled_containers",
421-
"--biocontainers",
422-
is_flag=True,
423-
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.",
418+
return _compose(
419+
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.",
425+
),
426+
planemo_option(
427+
"--container_resolvers_config_file",
428+
type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True),
429+
help="Container resolver config file",
430+
default=None,
431+
),
424432
)
425433

426434

0 commit comments

Comments
 (0)