From 44209ddfb3740d8e0e093878fea8febb9a3dae9d Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sat, 21 Dec 2019 17:45:05 +0100 Subject: [PATCH] Fix wrong layer ordering --- apk/vmmgr | 2 +- build/usr/lib/python3.6/lxcbuild/imagebuilder.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apk/vmmgr b/apk/vmmgr index bfd1b7c..a1ceeb1 160000 --- a/apk/vmmgr +++ b/apk/vmmgr @@ -1 +1 @@ -Subproject commit bfd1b7cb2f4b87e7987b66a8c47069e2e06c74db +Subproject commit a1ceeb1ead4f254fc285aabab0251beb85992bf3 diff --git a/build/usr/lib/python3.6/lxcbuild/imagebuilder.py b/build/usr/lib/python3.6/lxcbuild/imagebuilder.py index eba6b29..36df528 100644 --- a/build/usr/lib/python3.6/lxcbuild/imagebuilder.py +++ b/build/usr/lib/python3.6/lxcbuild/imagebuilder.py @@ -103,10 +103,9 @@ class ImageBuilder: os.chown(image_path, 100000, 100000) def set_layers(self, image): - # Extend list of layers with the list of layers from parent image - # Raies an exception when IMAGE has no name + # Prepend list of layers from parent image pkgmgr = PkgMgr() - self.image.conf['layers'].extend(pkgmgr.installed_packages['images'][image]['layers']) + self.image.conf['layers'] = pkgmgr.installed_packages['images'][image]['layers'] + [self.image.name] def copy_files(self, src, dst): # Copy files from the host or download them from a http(s) URL