Merge pull request #3346 from jmchilton/docker_tools_fix

[16.10] Fix explicit Docker container resolution.
This commit is contained in:
Björn Grüning
2016-12-21 23:00:45 +01:00
committed by GitHub
@@ -20,7 +20,7 @@ class ExplicitContainerResolver(ContainerResolver):
a correct container.
"""
for container_description in tool_info.container_descriptions:
if self._container_type_enabled(container_description):
return True
if self._container_type_enabled(container_description, enabled_container_types):
return container_description
return False
return None