Skip to content

Commit 8091199

Browse files
committed
[OMCProcessDocker*] cleanup user handling - variable current_user not needed anymore
1 parent 04fe7b3 commit 8091199

1 file changed

Lines changed: 10 additions & 20 deletions

File tree

OMPython/OMCSession.py

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
CONDITIONS OF OSMC-PL.
3535
"""
3636

37-
import getpass
3837
import io
3938
import json
4039
import logging
@@ -446,15 +445,6 @@ def __init__(
446445
# generate a random string for this session
447446
self._random_string = uuid.uuid4().hex
448447

449-
# get a user ID
450-
try:
451-
self._currentUser = getpass.getuser()
452-
if not self._currentUser:
453-
self._currentUser = "nobody"
454-
except KeyError:
455-
# We are running as a uid not existing in the password database... Pretend we are nobody
456-
self._currentUser = "nobody"
457-
458448
# omc port and log file
459449
self._omc_filebase = f"openmodelica.{self._random_string}"
460450

@@ -758,11 +748,12 @@ def _omc_command_docker(
758748
if isinstance(self._interactivePort, int):
759749
extraFlags = extraFlags + [f"--interactivePort={int(self._interactivePort)}"]
760750

761-
omc_command = (["docker", "run",
762-
"--cidfile", docker_cid_file.as_posix(),
763-
"--rm",
764-
"--env", f"USER={self._currentUser}",
765-
"--user", str(self._getuid())]
751+
omc_command = ([
752+
"docker", "run",
753+
"--cidfile", docker_cid_file.as_posix(),
754+
"--rm",
755+
"--user", str(self._getuid()),
756+
]
766757
+ self._dockerExtraArgs
767758
+ dockerNetworkStr
768759
+ [self._docker, self._dockerOpenModelicaPath]
@@ -808,7 +799,6 @@ def _omc_port_get(self) -> str:
808799

809800
def _omc_docker_start(self) -> Tuple[subprocess.Popen, DummyPopen, str]:
810801
my_env = os.environ.copy()
811-
my_env["USER"] = self._currentUser
812802

813803
docker_cid_file = self._temp_dir / (self._omc_filebase + ".docker.cid")
814804

@@ -909,9 +899,10 @@ def _omc_command_docker(self, omc_path_and_args_list) -> list:
909899
if isinstance(self._interactivePort, int):
910900
extraFlags = extraFlags + [f"--interactivePort={int(self._interactivePort)}"]
911901

912-
omc_command = (["docker", "exec",
913-
"--env", f"USER={self._currentUser}",
914-
"--user", str(self._getuid())]
902+
omc_command = ([
903+
"docker", "exec",
904+
"--user", str(self._getuid()),
905+
]
915906
+ self._dockerExtraArgs
916907
+ [self._dockerCid, self._dockerOpenModelicaPath]
917908
+ omc_path_and_args_list
@@ -955,7 +946,6 @@ def _omc_port_get(self) -> str:
955946

956947
def _omc_docker_start(self) -> Tuple[subprocess.Popen, DummyPopen]:
957948
my_env = os.environ.copy()
958-
my_env["USER"] = self._currentUser
959949

960950
omc_command = self._omc_command_docker(omc_path_and_args_list=["--locale=C",
961951
"--interactive=zmq",

0 commit comments

Comments
 (0)