From cdcea8c1b45d16088fd5093b3f1632135d4ebb5f Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 11 Dec 2023 16:45:13 +0100
Subject: [PATCH] Read image and container type from destination info

---
 lib/galaxy/jobs/runners/__init__.py | 43 +++++++++++++++--------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/lib/galaxy/jobs/runners/__init__.py b/lib/galaxy/jobs/runners/__init__.py
index 05ef30ac70ac..c3ab0d394679 100644
--- a/lib/galaxy/jobs/runners/__init__.py
+++ b/lib/galaxy/jobs/runners/__init__.py
@@ -562,27 +562,30 @@ def _find_container(
         return container
 
     def _get_metadata_container(self, job_wrapper):
-        tool_info = ToolInfo(
-            [ContainerDescription("galaxyproject/galaxy-job-execution")],
-            [],
-            False,
-            [],
-            guest_ports=None,
-            tool_id="__SET_METADATA__",
-            tool_version="1.0.3",
-            profile=23.2,
-        )
-        job_info = JobInfo(
-            working_directory=job_wrapper.working_directory,
-            tool_directory=None,
-            job_directory=None,
-            tmp_directory=None,
-            home_directory=None,
-            job_directory_type="galaxy",
-        )
-
         destination_info = job_wrapper.job_destination.params
-        return self.app.container_finder.find_container(tool_info, destination_info, job_info)
+        if destination_info.get("metadata_config", {}).get("containerize"):
+            image = destination_info["metadata_config"].get("image", "galaxyproject/galaxy-job-execution")
+            container_type = destination_info["metadata_config"].get("engine", "docker")
+            tool_info = ToolInfo(
+                [ContainerDescription(image, type=container_type)],
+                [],
+                False,
+                [],
+                guest_ports=None,
+                tool_id="__SET_METADATA__",
+                tool_version="1.0.3",
+                profile=23.2,
+            )
+            job_info = JobInfo(
+                working_directory=job_wrapper.working_directory,
+                tool_directory=None,
+                job_directory=None,
+                tmp_directory=None,
+                home_directory=None,
+                job_directory_type="galaxy",
+            )
+
+            return self.app.container_finder.find_container(tool_info, destination_info, job_info)
 
     def _handle_runner_state(self, runner_state, job_state: "JobState"):
         try: