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

Fix buildah login

Browse Source
This commit is contained in:
jpic 2020-02-16 19:09:27 +01:00
parent 92b62799f4
commit 3ea029efec
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
shlax/targets/buildah.py
View File

@ -119,19 +119,6 @@ class Buildah(Localhost):
] ]
await self.exec(*argv) await self.exec(*argv)
'''
if debug is True or 'cmd' in str(debug):
self.output.cmd(' '.join(argv))
proc = await asyncio.create_subprocess_shell(
shlex.join(argv),
stderr=sys.stderr,
stdin=sys.stdin,
stdout=sys.stdout,
)
await proc.communicate()
cli.exit_code = await proc.wait()
'''
async def commit(self): async def commit(self):
if not self.image: if not self.image:
@ -160,13 +147,13 @@ class Buildah(Localhost):
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'): if user and passwd and os.getenv('CI'):
self.output.cmd('buildah', 'login', '-u', '...', '-p', '...', self.image.registry) self.output.cmd('buildah login -u ... -p ...' + self.image.registry)
old = self.output.debug old = self.output.debug
self.output.debug = False self.output.debug = False
await self.exec('buildah', 'login', '-u', user, '-p', passwd, self.image.registry or 'docker.io', ) await self.exec('buildah', 'login', '-u', user, '-p', passwd, self.image.registry or 'docker.io', )
self.output.debug = old self.output.debug = old
for tag in self.image.tags: for tag in self.image.tags:
await self.exec('buildah', 'push', f'{self.image.repository}:{tag}') await self.exec('buildah', 'push', self.image.registry or 'docker.io', 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():