Merge master into benvin/drop-el8

2026-10-09 22:27:04 +11:00
parent 10e6b02921 11f70be98b
commit 5b1fd761a4
88 changed files with 209 additions and 120 deletions
@@ -752,7 +752,7 @@ def get_base_image_from_metadata(package_dir: Path, distro: str = "el/9") -> str
        Base image URL or default if not found
    """
    metadata_file = package_dir / "metadata.yaml"
-    default_image = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest"
+    default_image = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9"

    if not metadata_file.exists():
        return default_image
@@ -783,7 +783,7 @@ def build_package_docker(
    package_release: str,
    dist_dir: Path,
    repository: str,
-    base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest",
+    base_image: str = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9",
    dry_run: bool = False
 ) -> bool:
    """
@@ -1065,7 +1065,7 @@ def build_package_buildah(
    package_release: str,
    dist_dir: Path,
    repository: str,
-    base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest",
+    base_image: str = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9",
    dry_run: bool = False
 ) -> bool:
    """
@@ -1262,7 +1262,7 @@ class PackageInfo:
    release: str
    directory: Path
    distro: str = 'almalinux/el9'
-    base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest"
+    base_image: str = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9"
    arch: str = 'amd64'

    def __str__(self):