diff --git a/planemo/galaxy/config.py b/planemo/galaxy/config.py index 7834fe8be..9d53fb837 100644 --- a/planemo/galaxy/config.py +++ b/planemo/galaxy/config.py @@ -1394,7 +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): metrics_conf = os.path.join(config_directory, "job_metrics_conf.xml") diff --git a/planemo/options.py b/planemo/options.py index b4c484ad1..94da1f1ce 100644 --- a/planemo/options.py +++ b/planemo/options.py @@ -416,12 +416,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, + ), )