From 63510bea237eb1ef58aab8294e06e65fb3b743f3 Mon Sep 17 00:00:00 2001
From: almahmoud <amahmou4@jhu.edu>
Date: Tue, 4 May 2021 17:09:23 -0400
Subject: [PATCH] Container monitor in destination

---
 config/job_conf.xml.interactivetools | 1 +
 lib/galaxy/config/__init__.py        | 1 -
 lib/galaxy/jobs/__init__.py          | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/job_conf.xml.interactivetools b/config/job_conf.xml.interactivetools
index e8556ad6a34..5daf8f054e5 100644
--- a/config/job_conf.xml.interactivetools
+++ b/config/job_conf.xml.interactivetools
@@ -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
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
index 143d0a766f2..1134db7e5d6 100644
--- a/lib/galaxy/config/__init__.py
+++ b/lib/galaxy/config/__init__.py
@@ -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)
 
diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index 45b97da4645..355ab01f926 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -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()))