Unverified Commit f420a619 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #15896 from bernt-matthias/merge/22.01_22.05

[22.05] merge 22.01 
parents 42c9affa a99c137e
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
"""This module describes the :class:`ExplicitContainerResolver` ContainerResolver plugin."""
import copy
import logging
import os
from typing import cast
@@ -80,11 +81,10 @@ class CachedExplicitSingularityContainerResolver(CliContainerResolver):
        hence the container_description hack here.
        """
        for container_description in tool_info.container_descriptions:  # type: ContainerDescription
            if container_description.type == "docker":
                desc_dict = container_description.to_dict()
                desc_dict["type"] = self.container_type
                desc_dict["identifier"] = f"docker://{container_description.identifier}"
                container_description = container_description.from_dict(desc_dict)
            container_description = copy.copy(container_description)
            if container_description.type == 'docker':
                container_description.type = self.container_type
                container_description.identifier = f"docker://{container_description.identifier}"
            if not self._container_type_enabled(container_description, enabled_container_types):
                return None
            if not self.cli_available: