From edac02308de47485fef91b176caadd78378394f5 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 28 Nov 2023 16:57:43 +0200 Subject: [PATCH] pihole: use semantic versioning matching (#1801) --- library/ix-dev/charts/pihole/upgrade_strategy | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/library/ix-dev/charts/pihole/upgrade_strategy b/library/ix-dev/charts/pihole/upgrade_strategy index 509e2f54f9..0fb0392264 100755 --- a/library/ix-dev/charts/pihole/upgrade_strategy +++ b/library/ix-dev/charts/pihole/upgrade_strategy @@ -1,14 +1,18 @@ #!/usr/bin/python3 import json +import re import sys -from catalog_update.upgrade_strategy import datetime_versioning +from catalog_update.upgrade_strategy import semantic_versioning + + +RE_STABLE_VERSION = re.compile(r'\d+\.\d+\.\d+') def newer_mapping(image_tags): key = list(image_tags.keys())[0] - tags = {t for t in image_tags[key]} - version = datetime_versioning(list(tags), '%Y.%m.%d') + tags = {t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} + version = semantic_versioning(list(tags)) if not version: return {}