|
@@ -8,12 +8,13 @@ from catalog_update.upgrade_strategy import semantic_versioning
|
|
|
|
|
|
# Drop _ffmpeg5 after Cobia is released for a while
|
|
|
RE_STABLE_VERSION = re.compile(r'[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?(_ffmpeg5)?')
|
|
|
+RE_CLEAN_VERSION = re.compile(r'0+([1-9])')
|
|
|
STRIP_TEXT = '_ffmpeg5'
|
|
|
|
|
|
|
|
|
def newer_mapping(image_tags):
|
|
|
key = list(image_tags.keys())[0]
|
|
|
- tags = {t.strip(STRIP_TEXT): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)}
|
|
|
+ tags = {RE_CLEAN_VERSION.sub("\\1", t.strip(STRIP_TEXT)): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)}
|
|
|
version = semantic_versioning(list(tags))
|
|
|
if not version:
|
|
|
return {}
|