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

Cleanup success code

Browse Source
This commit is contained in:
jpic 2020-02-16 18:34:15 +01:00
parent a5f6c4fe74
commit 3152f83971
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
shlax/targets/buildah.py
View File

@ -32,7 +32,6 @@ class Buildah(Localhost):
self.ctr = None self.ctr = None
self.mnt = None self.mnt = None
self.image = Image(commit) if commit else None self.image = Image(commit) if commit else None
self.push = push or os.getenv('CI')
self.config= dict( self.config= dict(
cmd=cmd or 'sh', cmd=cmd or 'sh',
) )
@ -150,26 +149,20 @@ class Buildah(Localhost):
)).out )).out
if self.image.tags: if self.image.tags:
tags = ' '.join([f'{self.image.repository}:{tag}' for tag in self.image.tags]) tags = [f'{self.image.repository}:{tag}' for tag in self.image.tags]
await self.exec('buildah', 'tag', self.sha, self.image.repository, tags, buildah=False) else:
tags = [self.image.repository]
if self.push: for tag in tags:
await self.exec('buildah', 'tag', self.sha, tag, buildah=False)
async def push(self):
user = os.getenv('DOCKER_USER') user = os.getenv('DOCKER_USER')
passwd = os.getenv('DOCKER_PASS') passwd = os.getenv('DOCKER_PASS')
if user and passwd and os.getenv('CI') and self.registry: if user and passwd and os.getenv('CI') and self.image.registry:
await self.exec( await self.exec('buildah', 'login', '-u', user, '-p', passwd, self.image.registry)
'podman',
'login',
'-u',
user,
'-p',
passwd,
self.registry,
buildah=False,
)
for tag in self.image.tags: for tag in self.image.tags:
await self.exec('podman', 'push', f'{self.image.repository}:{tag}', buildah=False) await self.exec('buildah', 'push', f'{self.image.repository}:{tag}')
async def clean(self, *args, **kwargs): async def clean(self, *args, **kwargs):
if self.is_runnable(): if self.is_runnable():
@ -177,22 +170,12 @@ class Buildah(Localhost):
await self.exec('umount', self.mnt / str(dst)[1:], buildah=False) await self.exec('umount', self.mnt / str(dst)[1:], buildah=False)
if self.status == 'success': if self.status == 'success':
if 'test' in self.kwargs and 'test' in args:
self.output.test(self)
await self.action('Docker',
*self.kwargs['test'].actions,
image=self.image,
mount={'.': '/app'},
workdir='/app',
)(*args, **kwargs)
await self.commit() await self.commit()
if 'push' in args:
await self.push()
if self.mnt is not None: if self.mnt is not None:
await self.exec('buildah', 'umount', self.ctr, buildah=False) await self.exec('buildah', 'umount', self.ctr, buildah=False)
if self.ctr is not None: if self.ctr is not None:
await self.exec('buildah', 'rm', self.ctr, buildah=False) await self.exec('buildah', 'rm', self.ctr, buildah=False)
if 'push' in args:
for tag in self.image.tags:
await self.exec('podman', 'push', f'{self.image.repository}:{tag}', buildah=False)