Skip to content

Commit

Permalink
Merge pull request #15893 from bernt-matthias/fix/cached_explicit_sin…
Browse files Browse the repository at this point in the history
…gularity_container_description

[22.01] cached_explicit_singularity: needs to copy container description
  • Loading branch information
mvdbeek authored Apr 4, 2023
2 parents 6f6e375 + e81fc67 commit f76d894
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/galaxy/tool_util/deps/container_resolvers/explicit.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""This module describes the :class:`ExplicitContainerResolver` ContainerResolver plugin."""
import copy
import logging
import os

Expand Down Expand Up @@ -77,11 +78,10 @@ def resolve(self, enabled_container_types, tool_info, install=False, **kwds):
hence the container_description hack here.
"""
for container_description in tool_info.container_descriptions: # type: ContainerDescription
container_description = copy.copy(container_description)
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.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:
Expand Down

0 comments on commit f76d894

Please sign in to comment.