Support GNS3 variables in Docker environment variables. Fixes #2033

2 years ago · 7490be6d5e
parent 4891dc9eee
commit 7490be6d5e
1 changed files with 6 additions and 0 deletions
--- a/gns3server/compute/docker/docker_vm.py
+++ b/gns3server/compute/docker/docker_vm.py
@ -388,6 +388,12 @@ class DockerVM(BaseNode):
                    continue
                if not e.startswith("GNS3_"):
                    formatted = self._format_env(variables, e)
+                    vm_name = self._name.replace(",", ",,")
+                    project_path = self.project.path.replace(",", ",,")
+                    formatted = formatted.replace("%vm-name%", '"' + vm_name.replace('"', '\\"') + '"')
+                    formatted = formatted.replace("%vm-id%", self._id)
+                    formatted = formatted.replace("%project-id%", self.project.id)
+                    formatted = formatted.replace("%project-path%", '"' + project_path.replace('"', '\\"') + '"')
                    params["Env"].append(formatted)

        if self._console_type == "vnc":