gilles/runon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

always build image with docker cmd

Browse Source
This commit is contained in:
Gilles Grandou 2023-12-04 23:49:19 +01:00
parent 7dc36feaa3
commit bd6a026e9c
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runon/runon.py
View File

@ -115,8 +115,6 @@ def build_image(client, conf, update, verbose):
dockerfile.append(pkginstall.format(p)) dockerfile.append(pkginstall.format(p))
try: try:
if verbose: if verbose:
# fallback to external command 'docker build' as there is
# no way to follow the build progress with API.
print('Building image {} ...'.format(tag)) print('Building image {} ...'.format(tag))
cmd = ['docker', 'build'] cmd = ['docker', 'build']
if update: if update:
@ -126,13 +124,6 @@ def build_image(client, conf, update, verbose):
input='\n'.join(dockerfile).encode('utf-8'), input='\n'.join(dockerfile).encode('utf-8'),
stderr=subprocess.STDOUT, check=True) stderr=subprocess.STDOUT, check=True)
image = client.images.get(tag) image = client.images.get(tag)
else:
with io.BytesIO('\n'.join(dockerfile).encode('utf-8')) as fd:
image, logs = client.images.build(tag=tag, fileobj=fd, rm=True, nocache=update)
if verbose:
print('Built image {} / {}'.format(image.tags[0], image.short_id))
for l in logs:
print(l.get('stream', '').strip('\n'))
if not os.path.exists(cache_dir): if not os.path.exists(cache_dir):
os.mkdir(cache_dir) os.mkdir(cache_dir)