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

Login if pushing only

Browse Source
This commit is contained in:
jpic 2020-01-31 19:57:17 +01:00
parent 897e069a11
commit d25d1cdb63
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
podctl/visitors/commit.py
View File

@ -43,12 +43,6 @@ class Commit:
self.tags = [t for t in self.tags if t is not None] self.tags = [t for t in self.tags if t is not None]
def post_build(self, script): def post_build(self, script):
user = os.getenv('DOCKER_USER')
passwd = os.getenv('DOCKER_PASS')
if user and passwd and os.getenv('CI') and self.registry:
subprocess.check_call([
'podman', 'login', '-u', user, '-p', passwd, self.registry])
script.append(f''' script.append(f'''
umounts umounts
buildah commit --format={self.format} $ctr {self.repo} buildah commit --format={self.format} $ctr {self.repo}
@ -58,5 +52,14 @@ class Commit:
script.append(f'buildah tag {self.repo} ' + ' '.join(self.tags)) script.append(f'buildah tag {self.repo} ' + ' '.join(self.tags))
if self.push: if self.push:
user = os.getenv('DOCKER_USER')
passwd = os.getenv('DOCKER_PASS')
if user and passwd and os.getenv('CI') and self.registry:
subprocess.check_call([
'podman', 'login',
'-u', user, '-p', passwd,
self.registry
])
for tag in self.tags: for tag in self.tags:
script.append(f'podman push {self.repo}:{tag}') script.append(f'podman push {self.repo}:{tag}')

1
tests/test_build.py
View File

@ -17,6 +17,7 @@ from podctl.visitors import packages
packages.subprocess.check_call = mock.Mock() packages.subprocess.check_call = mock.Mock()
os.environ['CACHE_DIR'] = '/test' os.environ['CACHE_DIR'] = '/test'
os.environ['CI'] = '1'
def script_test(name, *visitors): def script_test(name, *visitors):