summaryrefslogtreecommitdiff
path: root/morphlib/builder.py
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-02-04 09:39:38 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2015-02-06 12:55:17 +0000
commit1701ee47ee9261ce52d8509f1fff1ad8a4e3134b (patch)
tree188005716d21e8f5729079fc1940d1041865a4a3 /morphlib/builder.py
parent2a2b15bf3b8e471ce8b2e61f49f2ad3b8879ef93 (diff)
downloadmorph-1701ee47ee9261ce52d8509f1fff1ad8a4e3134b.tar.gz
Use overlayfs when building systems
This will allow us to cache systems as a list of chunks and a small filesystem delta, rather than a massive tarball.
Diffstat (limited to 'morphlib/builder.py')
-rw-r--r--morphlib/builder.py28
1 files changed, 23 insertions, 5 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py
index 1bf4d454..40df10c3 100644
--- a/morphlib/builder.py
+++ b/morphlib/builder.py
@@ -555,13 +555,25 @@ class SystemBuilder(BuilderBase): # pragma: no cover
for a_name, artifact in self.source.artifacts.iteritems():
handle = self.local_artifact_cache.put(artifact)
-
try:
fs_root = self.staging_area.destdir(self.source)
self.unpack_strata(fs_root)
- self.write_metadata(fs_root, a_name)
- self.run_system_integration_commands(fs_root)
- unslashy_root = fs_root[1:]
+ overlay_root = self.staging_area.overlay_upperdir(
+ self.source)
+ editable_root = self.staging_area.overlaydir(self.source)
+ workdir = os.path.join(self.staging_area.dirname,
+ 'overlayfs-workdir')
+ if not os.path.exists(workdir):
+ os.makedirs(workdir)
+ options = '-olowerdir=%s,upperdir=%s,workdir=%s' % \
+ (fs_root, overlay_root, workdir)
+ morphlib.fsutils.mount(self.app.runcmd,
+ 'overlay-%s' % a_name,
+ editable_root,
+ 'overlay', options)
+ self.write_metadata(editable_root, a_name)
+ self.run_system_integration_commands(editable_root)
+ unslashy_root = editable_root[1:]
def uproot_info(info):
info.name = relpath(info.name, unslashy_root)
if info.islnk():
@@ -571,15 +583,21 @@ class SystemBuilder(BuilderBase): # pragma: no cover
tar = tarfile.open(fileobj=handle, mode="w", name=a_name)
self.app.status(msg='Constructing tarball of rootfs',
chatty=True)
- tar.add(fs_root, recursive=True, filter=uproot_info)
+ tar.add(editable_root, recursive=True, filter=uproot_info)
tar.close()
except BaseException as e:
logging.error(traceback.format_exc())
self.app.status(msg='Error while building system',
error=True)
+ if editable_root and os.path.exists(editable_root):
+ morphlib.fsutils.unmount(self.app.runcmd,
+ editable_root)
handle.abort()
raise
else:
+ if editable_root and os.path.exists(editable_root):
+ morphlib.fsutils.unmount(self.app.runcmd,
+ editable_root)
handle.close()
self.save_build_times()