mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Container monitor in destination
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
<param id="docker_net">bridge</param>
|
||||
<param id="docker_auto_rm">true</param>
|
||||
<param id="require_container">true</param>
|
||||
<param id="container_monitor">true</param>
|
||||
<param id="docker_set_user"></param>
|
||||
<!-- InteractiveTools do need real hostnames or URLs to work - simply specifying IPs will not work.
|
||||
If you develop interactive tools on your 'localhost' and don't have a proper domain name
|
||||
|
||||
@@ -849,7 +849,6 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
|
||||
self.interactivetools_map = self._in_root_dir(kwargs.get("interactivetools_map", self._in_data_dir("interactivetools_map.sqlite")))
|
||||
self.interactivetools_prefix = kwargs.get("interactivetools_prefix", "interactivetool")
|
||||
self.interactivetools_proxy_host = kwargs.get("interactivetools_proxy_host", None)
|
||||
self.interactivetools_use_k8s_ingress = kwargs.get("interactivetools_use_k8s_ingress", False)
|
||||
|
||||
self.containers_conf = parse_containers_config(self.containers_config_file)
|
||||
|
||||
|
||||
@@ -2151,7 +2151,7 @@ class JobWrapper(HasResourceParameters):
|
||||
return True
|
||||
|
||||
def container_monitor_command(self, container, **kwds):
|
||||
if not container or not self.tool.produces_entry_points or self.app.config.interactivetools_use_k8s_ingress:
|
||||
if not container or not self.tool.produces_entry_points or not self.get_destination_configuration("container_monitor", True):
|
||||
return None
|
||||
|
||||
exec_dir = kwds.get('exec_dir', os.path.abspath(os.getcwd()))
|
||||
|
||||
Reference in New Issue
Block a user