mark more images as singleton image

src/bci_build/package/__init__.py

@@ -1334,7 +1334,7 @@ def build_name(self) -> str | None:
             if self.stability_tag:
                 build_name = f"{self.registry_prefix}/{self.name}-{self.stability_tag}"
             if self.is_singleton_image:
-                build_name = build_name.partition(":")[0]
+                build_name = build_name.rpartition("-")[0]
             return build_name.replace("/", ":").replace(":", "-")
 
         return None

src/bci_build/package/git.py

@@ -20,6 +20,7 @@
         custom_description="A micro environment with Git {based_on_container}.",
         from_target_image=generate_from_image_tag(os_version, "bci-micro"),
         is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
+        is_singleton_image=True,
         version="%%git_version%%",
         tag_version=format_version(
             git_version := get_pkg_version("git", os_version), ParseVersion.MINOR

src/bci_build/package/helm.py

@@ -19,6 +19,7 @@
         exclusive_arch=[Arch.AARCH64, Arch.PPC64LE, Arch.S390X, Arch.X86_64],
         os_version=os_version,
         is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
+        is_singleton_image=True,
         version="%%helm_version%%",
         tag_version=format_version(
             helm_ver := get_pkg_version("helm", os_version), ParseVersion.MINOR

src/bci_build/package/kiwi.py

@@ -26,6 +26,7 @@ def generate_kiwi_10_config():
         custom_description="{pretty_name} container {based_on_container}. {privileged_only}",
         os_version=os_version,
         is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
+        is_singleton_image=True,
         # kiwi is not L3 supported
         # support_level=SupportLevel.L3,
         version="%%kiwi_version%%",

src/bci_build/package/spack.py

@@ -20,6 +20,7 @@
         custom_description="{pretty_name} container for building containerized HPC solution stacks, {based_on_container}.",
         os_version=os_version,
         is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
+        is_singleton_image=True,
         logo_url="https://spack.io/assets/images/spack-logo-white.svg",
         version=(spack_pkg_version := get_pkg_version("spack", os_version)),
         tag_version=format_version(spack_pkg_version, ParseVersion.MINOR),

src/bci_build/package/stunnel.py

@@ -19,6 +19,7 @@
         is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
         from_target_image=generate_from_image_tag(os_version, "bci-micro"),
         version=(stunnel_version_re := "%%stunnel_re%%"),
+        is_singleton_image=True,
         pretty_name="Stunnel",
         package_list=["stunnel"],
         replacements_via_service=[