zuul
/
zuul
Code Issues Proposed changes

Merge "Add /etc/hosts and /etc/nsswitch.conf to the bubblewrap" into feature/zuulv3

This commit is contained in:
Jenkins 2017-07-14 17:21:35 +00:00 committed by Gerrit Code Review
parent e4dc8771e5 a19e8c57c7
commit 41efa8827a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,6 +150,7 @@ class BubblewrapDriver(Driver, WrapperInterface):
'--ro-bind', '/bin', '/bin',
'--ro-bind', '/sbin', '/sbin',
'--ro-bind', '/etc/resolv.conf', '/etc/resolv.conf',
'--ro-bind', '/etc/hosts', '/etc/hosts',
'--ro-bind', '{ssh_auth_sock}', '{ssh_auth_sock}',
'--dir', '{work_dir}',
'--bind', '{work_dir}', '{work_dir}',
@ -166,6 +167,9 @@ class BubblewrapDriver(Driver, WrapperInterface):
if os.path.isdir('/lib64'):
bwrap_command.extend(['--ro-bind', '/lib64', '/lib64'])
if os.path.isfile('/etc/nsswitch.conf'):
bwrap_command.extend(['--ro-bind', '/etc/nsswitch.conf',
'/etc/nsswitch.conf'])
return bwrap_command