add option to specify container resolver config file

galaxyproject · Dec 18, 2023 · f6074c3 · f6074c3
1 parent 6759d00
commit f6074c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/planemo/galaxy/config.py b/planemo/galaxy/config.py
@@ -1394,6 +1394,8 @@ def _handle_container_resolution(ctx, kwds, galaxy_properties):
         involucro_context = build_involucro_context(ctx, **kwds)
         galaxy_properties["involucro_auto_init"] = "False"  # Use planemo's
         galaxy_properties["involucro_path"] = involucro_context.involucro_bin
+    if kwds.get("container_resolvers_config_file"):
+        galaxy_properties["container_resolvers_config_file"] = kwds.get("container_resolvers_config_file")
 
 
 def _handle_job_metrics(config_directory, kwds):

diff --git a/planemo/options.py b/planemo/options.py
@@ -415,12 +415,20 @@ def tool_data_path_option():
 
 
 def mulled_containers_option():
-    return planemo_option(
-        "mulled_containers",
-        "--mulled_containers",
-        "--biocontainers",
-        is_flag=True,
-        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.",
+    return _compose(
+        planemo_option(
+            "mulled_containers",
+            "--mulled_containers",
+            "--biocontainers",
+            is_flag=True,
+            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.",
+        ),
+        planemo_option(
+            "--container_resolvers_config_file",
+            type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True),
+            help="Container resolver config file",
+            default=None,
+        ),
     )