sam/shlax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: legacy code would prevent containers from shuting down after build

Browse Source
This commit is contained in:
jpic 2020-05-31 02:45:24 +02:00
parent 5caf9d92e3
commit c570f0fd6d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shlax/targets/buildah.py
View File

@ -141,13 +141,9 @@ class Buildah(Target):
async def clean(self, target): async def clean(self, target):
for src, dst in self.mounts.items(): for src, dst in self.mounts.items():
await self.parent.exec('umount', self.root / str(dst)[1:]) await self.parent.exec('umount', self.root / str(dst)[1:])
else:
return
if self.result.status == 'success': if self.result.status == 'success':
await self.commit() await self.commit()
if os.getenv('BUILDAH_PUSH'):
await self.image.push(target)
if self.root is not None: if self.root is not None:
await self.parent.exec('buildah', 'umount', self.ctr) await self.parent.exec('buildah', 'umount', self.ctr)
@ -155,6 +151,10 @@ class Buildah(Target):
if self.ctr is not None: if self.ctr is not None:
await self.parent.exec('buildah', 'rm', self.ctr) await self.parent.exec('buildah', 'rm', self.ctr)
if self.result.status == 'success':
if os.getenv('BUILDAH_PUSH'):
await self.image.push(target)
async def mount(self, src, dst): async def mount(self, src, dst):
"""Mount a host directory into the container.""" """Mount a host directory into the container."""
target = self.root / str(dst)[1:] target = self.root / str(dst)[1:]