Unverified Commit 572584cb authored by John Chilton's avatar John Chilton Committed by GitHub
Browse files

Merge pull request #12039 from bgruening/galaxy_memory 

[21.01] add GALAXY_MEMORY_MB* to passt hrough
parents 9a97d616 533f8628

lib/galaxy/tool_util/deps/dependencies.py

+1 −1
Original line number Diff line number Diff line
@@ -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:

lib/galaxy/tool_util/parser/interface.py

+2 −1
Original line number Diff line number Diff line
@@ -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):