From 533f86287dd726e689f38634aa825946c213de09 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Sun, 23 May 2021 12:26:34 +0200 Subject: [PATCH] add GALAXY_MEMORY_MB* to passt hrough --- lib/galaxy/tool_util/deps/dependencies.py | 2 +- lib/galaxy/tool_util/parser/interface.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tool_util/deps/dependencies.py b/lib/galaxy/tool_util/deps/dependencies.py index 2d362f8cbc1..760eac66239 100644 --- a/lib/galaxy/tool_util/deps/dependencies.py +++ b/lib/galaxy/tool_util/deps/dependencies.py @@ -42,7 +42,7 @@ class ToolInfo: def __init__(self, container_descriptions=None, requirements=None, requires_galaxy_python_environment=False, env_pass_through=None, guest_ports=None, tool_id=None, tool_version=None, profile=-1): if env_pass_through is None: - env_pass_through = ["GALAXY_SLOTS"] + env_pass_through = ["GALAXY_SLOTS", "GALAXY_MEMORY_MB", "GALAXY_MEMORY_MB_PER_SLOT"] if container_descriptions is None: container_descriptions = [] if requirements is None: diff --git a/lib/galaxy/tool_util/parser/interface.py b/lib/galaxy/tool_util/parser/interface.py index 8c549f3aa4a..96c974dd2d2 100644 --- a/lib/galaxy/tool_util/parser/interface.py +++ b/lib/galaxy/tool_util/parser/interface.py @@ -110,7 +110,8 @@ class ToolSource(metaclass=ABCMeta): return ["TMPDIR", "TMP", "TEMP"] def parse_docker_env_pass_through(self): - return ["GALAXY_SLOTS", "HOME", "_GALAXY_JOB_HOME_DIR", "_GALAXY_JOB_TMP_DIR"] + self.parse_tmp_directory_vars() + return ["GALAXY_SLOTS", "GALAXY_MEMORY_MB", "GALAXY_MEMORY_MB_PER_SLOT", "HOME", + "_GALAXY_JOB_HOME_DIR", "_GALAXY_JOB_TMP_DIR"] + self.parse_tmp_directory_vars() @abstractmethod def parse_interpreter(self):