Merge "Don't automatically mount user home in executor" into feature/zuulv3
diff --git a/zuul/driver/bubblewrap/__init__.py b/zuul/driver/bubblewrap/__init__.py
index 9e9a26e..95b09e0 100644
--- a/zuul/driver/bubblewrap/__init__.py
+++ b/zuul/driver/bubblewrap/__init__.py
@@ -87,7 +87,6 @@
'--dir', '{work_dir}',
'--bind', '{work_dir}', '{work_dir}',
'--dev', '/dev',
- '--dir', '{user_home}',
'--chdir', '{work_dir}',
'--unshare-all',
'--share-net',
@@ -128,7 +127,9 @@
# 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 @@
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",