Merging 2.1 into 2.2

This commit is contained in:
grossmj committed 2019-02-22 18:04:49 +07:00
commit 5754747a90
16 files changed
+102 -46

No files matched your search

+3
View File
@@ -353,6 +353,9 @@ class DockerVM(BaseNode):
if self._environment:
for e in self._environment.strip().split("\n"):
e = e.strip()
if e.split("=")[0] == "":
self.project.emit("log.warning", {"message": "{} has invalid environment variable: {}".format(self.name, e)})
continue
if not e.startswith("GNS3_"):
formatted = self._format_env(variables, e)
params["Env"].append(formatted)