qurator-spk/ocrd-galley
1
0
Fork 0
mirror of https://github.com/qurator-spk/ocrd-galley.git synced 2025-06-08 22:29:56 +02:00
Code Issues Projects Releases Wiki Activity

🐛 Run the correct image when user called 'ocrd resmgr {download,list-available}'

Browse source
This commit is contained in:
Gerber, Mike 2023-03-20 19:20:30 +01:00
parent 8ddc8b3504
commit 397af5542b
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
wrapper/qurator/ocrd_galley/cli.py
View file

@ -63,7 +63,19 @@ def main():
argv = sys.argv.copy() argv = sys.argv.copy()
argv[0] = os.path.basename(argv[0]) argv[0] = os.path.basename(argv[0])
sub_image = sub_images[argv[0]] # If we're running ocrd resmgr download we need to run the correct subimage.
if argv[:3] == ["ocrd", "resmgr", "download"] or \
argv[:3] == ["ocrd", "resmgr", "list-available"]:
# Default to the base image
sub_image = sub_images[argv[0]]
# But look for a match of the executable
for x in argv[3:]:
if x in sub_images:
sub_image = sub_images[x]
break
else:
sub_image = sub_images[argv[0]]
docker_image = "%s-%s:%s" % (DOCKER_IMAGE_PREFIX, sub_image, DOCKER_IMAGE_TAG) docker_image = "%s-%s:%s" % (DOCKER_IMAGE_PREFIX, sub_image, DOCKER_IMAGE_TAG)
if DOCKER_IMAGE_TAG != "latest": if DOCKER_IMAGE_TAG != "latest":