ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-06-23 02:05:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix run as user feature (TRAINS_AGENT_EXEC_USER)

Browse Source
This commit is contained in:
allegroai 2020-03-20 10:42:32 +02:00
parent 98198b8006
commit 482007c4ce
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
trains_agent/commands/worker.py
View File

@ -1215,7 +1215,8 @@ class Worker(ServiceCommandSection):
# check if we want to run as another user, only supported on linux # check if we want to run as another user, only supported on linux
if os.environ.get(ENV_TASK_EXECUTE_AS_USER, None) and is_linux_platform(): if os.environ.get(ENV_TASK_EXECUTE_AS_USER, None) and is_linux_platform():
command, script_dir = self._run_as_user_patch( command, script_dir = self._run_as_user_patch(
command, script_dir, venv_folder, command, self._session.config_file,
script_dir, venv_folder,
self._session.config.get('sdk.storage.cache.default_base_dir'), self._session.config.get('sdk.storage.cache.default_base_dir'),
os.environ.get(ENV_TASK_EXECUTE_AS_USER)) os.environ.get(ENV_TASK_EXECUTE_AS_USER))
use_execv = False use_execv = False
@ -2081,12 +2082,22 @@ class Worker(ServiceCommandSection):
except: except:
pass pass
# make sure we could access the trains_conf file
try:
user_trains_conf = os.path.join(home_folder, 'trains.conf')
shutil.copy(trains_conf, user_trains_conf)
Path(user_trains_conf).chmod(0o0777)
except:
user_trains_conf = trains_conf
# patch venv folder to new location # patch venv folder to new location
script_dir = script_dir.replace(venv_folder, new_venv_folder) script_dir = script_dir.replace(venv_folder, new_venv_folder)
# New command line execution # New command line execution
command = RunasArgv('bash', '-c', 'HOME=\"{}\" PATH=\"{}\" {}'.format( command = RunasArgv('bash', '-c', 'HOME=\"{}\" PATH=\"{}\" PYTHONPATH=\"{}\" TRAINS_CONFIG_FILE={} {}'.format(
home_folder, home_folder,
os.environ.get('PATH', '').replace(venv_folder, new_venv_folder), os.environ.get('PATH', '').replace(venv_folder, new_venv_folder),
os.environ.get('PYTHONPATH', '').replace(venv_folder, new_venv_folder),
user_trains_conf,
command.serialize().replace(venv_folder, new_venv_folder))) command.serialize().replace(venv_folder, new_venv_folder)))
command.set_uid(user_uid=user_uid, user_gid=user_uid) command.set_uid(user_uid=user_uid, user_gid=user_uid)