diff --git a/doc/source/admin/jobs.md b/doc/source/admin/jobs.md index 29791355387..7a4eace5494 100644 --- a/doc/source/admin/jobs.md +++ b/doc/source/admin/jobs.md @@ -117,7 +117,7 @@ The images used for containers can either be specified explicitly in the ```` tag or a mulled (multi package) container is implied for the set of packages specified by the tool's ```` tags. In either case the container to be used is determined using container resolvers that can be specified -globally for an instance of locally per instance, see [Container resolvers](container_resolvers.md). +globally for an instance of locally per instance, see [Container resolvers](container_resolvers). ### Running jobs on a Kubernetes cluster via Pulsar diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample index dc2aef9842d..621d546a935 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -710,7 +710,7 @@ galaxy: # container resolvers to use when discovering containers for Galaxy. # If this is set to None, the default container resolvers loaded is # determined by enable_mulled_containers. For available options see - # https://docs.galaxyproject.org/en/master/admin/container_resolvers.rst. + # https://docs.galaxyproject.org/en/master/admin/container_resolvers.html #container_resolvers_config_file: null # Rather than specifying a container_resolvers_config_file, the diff --git a/test/integration/test_container_resolvers.py b/test/integration/test_container_resolvers.py index 339169cee29..f00efcfc309 100644 --- a/test/integration/test_container_resolvers.py +++ b/test/integration/test_container_resolvers.py @@ -933,7 +933,6 @@ class TestCondaFallBackAndRequireContainer(DockerContainerResolverTestCase, Cont {"id": "upload1", "environment": "local_upload"}, ], } - # config["job_config"]["execution"]["environments"]["local_docker"]["require_container"] = True config["container_resolvers"] = cls.container_resolvers_config