Fixed (again) application params and env variables in docker

ICRAR · Jun 10, 2022 · a68f816 · a68f816
1 parent 0fd9f81
commit a68f816
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/daliuge-engine/dlg/apps/dockerapp.py b/daliuge-engine/dlg/apps/dockerapp.py
@@ -520,7 +520,7 @@ def run(self):
                         logger.warning(
                             "Ignoring provided environment variables: Format wrong? Check documentation"
                         )
-                    addEnv = {}
+                        addEnv = {}
                     if isinstance(addEnv, dict):  # if it is a dict populate directly
                         # but replace placeholders first
                         for key in addEnv:

diff --git a/daliuge-translator/dlg/dropmake/lg.py b/daliuge-translator/dlg/dropmake/lg.py
@@ -704,6 +704,7 @@ def _create_test_drop_spec(self, oid, rank, kwargs) -> dropdict:
             drop_spec = dropdict(
                 {"oid": oid, "type": DropType.APP, "app": app_str, "rank": rank}
             )
+            self._update_key_value_attributes(kwargs)
             if "execution_time" in self.jd:
                 kwargs["tw"] = int(self.jd["execution_time"])
             else:
@@ -772,6 +773,7 @@ def _create_test_drop_spec(self, oid, rank, kwargs) -> dropdict:
             kwargs["additionalBindings"] = str(self.jd.get("additionalBindings", ""))
             kwargs["portMappings"] = str(self.jd.get("portMappings", ""))
             kwargs["shmSize"] = str(self.jd.get("shmSize", ""))
+            self._update_key_value_attributes(kwargs)
             drop_spec.update(kwargs)
 
         elif drop_type == Categories.GROUP_BY: