From 7490be6d5ee3a6f2b8664dd83dfe072cd0e6f318 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 23 Feb 2022 14:33:30 +1030 Subject: [PATCH] Support GNS3 variables in Docker environment variables. Fixes #2033 --- gns3server/compute/docker/docker_vm.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py index b662e2e5..a34c60ad 100644 --- 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":