summaryrefslogtreecommitdiff
path: root/zuul/driver/bubblewrap
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2019-01-18 16:03:46 +0000
committerMonty Taylor <mordred@inaugust.com>2019-01-24 16:11:31 +0000
commit7fe0e780cf4278feccd78290e7d6638e3ac4f79b (patch)
tree8739fa48b12f65155cf9c37d8985f57a714aeff6 /zuul/driver/bubblewrap
parent8a38ee711f4253f4a8c02eefe0bcef26e0464d47 (diff)
downloadzuul-7fe0e780cf4278feccd78290e7d6638e3ac4f79b.tar.gz
Build zuul containers with dockerfile not pbrx
While pbrx is nice and all, it's quite the divergence from how the rest of the container ecosystem works. Switch to using Dockerfile and the python-builder image. Bind mount ld.so.cache into bwrap context When using images based on the python:slim base image, python is installed in /usr/local and the linker needs to know to look in /usr/local/lib for shared libraries. Depends-On: https://review.openstack.org/632187 Change-Id: I84f6dd2a8e3222f7807103dcbb61bdadedfdd22d
Diffstat (limited to 'zuul/driver/bubblewrap')
-rw-r--r--zuul/driver/bubblewrap/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/zuul/driver/bubblewrap/__init__.py b/zuul/driver/bubblewrap/__init__.py
index e4af62e42..b015d6279 100644
--- a/zuul/driver/bubblewrap/__init__.py
+++ b/zuul/driver/bubblewrap/__init__.py
@@ -193,6 +193,7 @@ class BubblewrapDriver(Driver, WrapperInterface):
'--ro-bind', '/lib', '/lib',
'--ro-bind', '/bin', '/bin',
'--ro-bind', '/sbin', '/sbin',
+ '--ro-bind', '/etc/ld.so.cache', '/etc/ld.so.cache',
'--ro-bind', '/etc/resolv.conf', '/etc/resolv.conf',
'--ro-bind', '/etc/hosts', '/etc/hosts',
'--ro-bind', '/etc/localtime', '/etc/localtime',