ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-12 20:38:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updated tests for setting docker user

Browse Source
This commit is contained in:
Karim
2019-04-05 11:06:35 +01:00
parent 7c3a38d379
commit 6df93d4db0
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/compute/docker/docker_vm.py
View File

@ -311,7 +311,6 @@ class DockerVM(BaseNode):
"Tty": True,
"OpenStdin": True,
"StdinOnce": False,
"User": "root",
"HostConfig": {
"CapAdd": ["ALL"],
"Privileged": True,
@ -320,7 +319,7 @@ class DockerVM(BaseNode):
"Volumes": {},
"Env": ["container=docker"], # Systemd compliant: https://github.com/GNS3/gns3-server/issues/573
"Cmd": [],
"Entrypoint": image_infos.get("Config", {"Entrypoint": []})["Entrypoint"]
"Entrypoint": image_infos.get("Config", {"Entrypoint": []}).get("Entrypoint")
}
if params["Entrypoint"] is None:
@ -331,7 +330,7 @@ class DockerVM(BaseNode):
except ValueError as e:
raise DockerError("Invalid start command '{}': {}".format(self._start_command, e))
if len(params["Cmd"]) == 0:
params["Cmd"] = image_infos.get("Config", {"Cmd": []})["Cmd"]
params["Cmd"] = image_infos.get("Config", {"Cmd": []}).get("Cmd")
if params["Cmd"] is None:
params["Cmd"] = []
if len(params["Cmd"]) == 0 and len(params["Entrypoint"]) == 0:
@ -344,7 +343,9 @@ class DockerVM(BaseNode):
params["Env"].append("GNS3_VOLUMES={}".format(":".join(self._volumes)))
# Pass user configured for image to init script
params["Env"].append("GNS3_USER={}".format(image_infos.get("Config", {"User": ""})["User"]))
if image_infos.get("Config", {"User": ""}).get("User"):
params["User"] = "root"
params["Env"].append("GNS3_USER={}".format(image_infos.get("Config", {"User": ""})["User"]))
variables = self.project.variables
if not variables: