zuul
/
zuul
Code Issues Proposed changes

Merge "Don't automatically mount user home in executor" into feature/zuulv3

This commit is contained in:
Jenkins 2017-06-29 17:11:15 +00:00 committed by Gerrit Code Review
parent 3e3207b78d 2ee4770337
commit a6f7162b34
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/driver/bubblewrap/__init__.py
View File

@ -87,7 +87,6 @@ class BubblewrapDriver(Driver, WrapperInterface):
'--dir', '{work_dir}',
'--bind', '{work_dir}', '{work_dir}',
'--dev', '/dev',
'--dir', '{user_home}',
'--chdir', '{work_dir}',
'--unshare-all',
'--share-net',
@ -128,7 +127,9 @@ class BubblewrapDriver(Driver, WrapperInterface):
# Need users and groups
uid = os.getuid()
passwd = pwd.getpwuid(uid)
passwd = list(pwd.getpwuid(uid))
# Replace our user's actual home directory with the work dir.
passwd = passwd[:5] + [kwargs['work_dir']] + passwd[6:]
passwd_bytes = b':'.join(
['{}'.format(x).encode('utf8') for x in passwd])
(passwd_r, passwd_w) = os.pipe()
@ -150,7 +151,6 @@ class BubblewrapDriver(Driver, WrapperInterface):
kwargs['gid'] = gid
kwargs['uid_fd'] = passwd_r
kwargs['gid_fd'] = group_r
kwargs['user_home'] = passwd.pw_dir
command = [x.format(**kwargs) for x in bwrap_command]
self.log.debug("Bubblewrap command: %s",