Skip to content

Commit ec615c3

Browse files
add option to specify container resolver config file
1 parent 987ff88 commit ec615c3

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
@@ -1433,6 +1433,8 @@ def _handle_container_resolution(ctx, kwds, galaxy_properties):
14331433
involucro_context = build_involucro_context(ctx, **kwds)
14341434
galaxy_properties["involucro_auto_init"] = "False" # Use planemo's
14351435
galaxy_properties["involucro_path"] = involucro_context.involucro_bin
1436+
if kwds.get("container_resolvers_config_file"):
1437+
galaxy_properties["container_resolvers_config_file"] = kwds.get("container_resolvers_config_file")
14361438

14371439

14381440
def _handle_job_metrics(config_directory, kwds):

planemo/options.py

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

430430

431431
def mulled_containers_option():
432-
return planemo_option(
433-
"mulled_containers",
434-
"--mulled_containers",
435-
"--biocontainers",
436-
is_flag=True,
437-
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.",
432+
return _compose(
433+
planemo_option(
434+
"mulled_containers",
435+
"--mulled_containers",
436+
"--biocontainers",
437+
is_flag=True,
438+
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.",
439+
),
440+
planemo_option(
441+
"--container_resolvers_config_file",
442+
type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True),
443+
help="Container resolver config file",
444+
default=None,
445+
),
438446
)
439447

440448

0 commit comments

Comments
 (0)