Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong layer ordering

Browse Source
This commit is contained in:
Disassembler 2019-12-21 17:45:05 +01:00
parent e355510575
commit 44209ddfb3
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apk/vmmgr

@ -1 +1 @@
Subproject commit bfd1b7cb2f4b87e7987b66a8c47069e2e06c74db Subproject commit a1ceeb1ead4f254fc285aabab0251beb85992bf3

5
build/usr/lib/python3.6/lxcbuild/imagebuilder.py
View File

@ -103,10 +103,9 @@ class ImageBuilder:
os.chown(image_path, 100000, 100000) os.chown(image_path, 100000, 100000)
def set_layers(self, image): def set_layers(self, image):
# Extend list of layers with the list of layers from parent image # Prepend list of layers from parent image
# Raies an exception when IMAGE has no name
pkgmgr = PkgMgr() 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): def copy_files(self, src, dst):
# Copy files from the host or download them from a http(s) URL # Copy files from the host or download them from a http(s) URL