zuul
/
zuul
Code Issues Proposed changes

Merge "Bindmount /etc/lsb-release into bubblewrap" into feature/zuulv3

This commit is contained in:
Jenkins 2017-08-11 00:36:45 +00:00 committed by Gerrit Code Review
parent 799d7d7db9 5d993ed71d
commit 2857140150
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import pwd
import shlex import shlex
import subprocess import subprocess
import sys import sys
import re
from typing import Dict, List # flake8: noqa from typing import Dict, List # flake8: noqa
@ -73,6 +74,7 @@ class BubblewrapDriver(Driver, WrapperInterface):
log = logging.getLogger("zuul.BubblewrapDriver") log = logging.getLogger("zuul.BubblewrapDriver")
mounts_map = {'rw': [], 'ro': []} # type: Dict[str, List] mounts_map = {'rw': [], 'ro': []} # type: Dict[str, List]
release_file_re = re.compile('^\W+-release$')
def __init__(self): def __init__(self):
self.bwrap_command = self._bwrap_command() self.bwrap_command = self._bwrap_command()
@ -170,11 +172,16 @@ class BubblewrapDriver(Driver, WrapperInterface):
'--file', '{gid_fd}', '/etc/group', '--file', '{gid_fd}', '/etc/group',
] ]
if os.path.isdir('/lib64'): for path in ['/lib64',
bwrap_command.extend(['--ro-bind', '/lib64', '/lib64']) '/etc/nsswitch.conf',
if os.path.isfile('/etc/nsswitch.conf'): '/etc/lsb-release.d',
bwrap_command.extend(['--ro-bind', '/etc/nsswitch.conf', ]:
'/etc/nsswitch.conf']) if os.path.exists(path):
bwrap_command.extend(['--ro-bind', path, path])
for fn in os.listdir('/etc'):
if self.release_file_re.match(fn):
path = os.path.join('/etc', fn)
bwrap_command.extend(['--ro-bind', path, path])
return bwrap_command return bwrap_command