diff --git a/hack/update-template-almalinux.sh b/hack/update-template-almalinux.sh index 8f3076aaea9..c6210308dc3 100755 --- a/hack/update-template-almalinux.sh +++ b/hack/update-template-almalinux.sh @@ -59,7 +59,7 @@ function almalinux_url_spec_from_location() { jq_filter='capture( "^https://repo\\.almalinux\\.org/almalinux/(?\\d+(\\.\\d+)?)/cloud/(?[^/]+)/images/" + "AlmaLinux-(?\\d+)-(?.*)-" + - "(latest|(?\\d+\\.\\d+)-(?\\d{8}))\\.(?[^.]+).(?.*)$" + "(latest|(?\\d+\\.\\d+)-(?\\d{8})(?:\\.\\d+)?)\\.(?[^.]+).(?.*)$" ;"x") ' url_spec=$(jq -e -r "${jq_filter}" <<<"\"${location}\"") @@ -112,7 +112,7 @@ function almalinux_latest_image_entry_for_url_spec() { capture( "^AlmaLinux-\($spec.major_version)-\($spec.target_vendor)-" + "(?\($spec.major_version)\\.\\d+)-" + - "(?\\d{8})\\.\($spec.arch)\\.\($spec.file_extension)$" + "(?\\d{8}(?:\\.\\d)?)\\.\($spec.arch)\\.\($spec.file_extension)$" ;"x" ) | .version_number_array = ([.major_minor_version | scan("\\d+") | tonumber]) diff --git a/templates/README.md b/templates/README.md index 33eccb8e2fd..da51eeedda5 100644 --- a/templates/README.md +++ b/templates/README.md @@ -12,7 +12,8 @@ Default: [`default`](./default.yaml) (⭐Ubuntu, with containerd/nerdctl) Distro: - [`almalinux-8`](./almalinux-8.yaml): AlmaLinux 8 -- [`almalinux-9`](./almalinux-9.yaml), `almalinux.yaml`: AlmaLinux 9 +- [`almalinux-9`](./almalinux-9.yaml): AlmaLinux 9 +- [`almalinux-10`](./almalinux-10.yaml), `almalinux.yaml`: AlmaLinux 10 - [`almalinux-kitten-10`](./almalinux-kitten-10.yaml), `almalinux-kitten.yaml`: AlmaLinux Kitten 10 - [`alpine`](./alpine.yaml): ☆Alpine Linux - [`alpine-iso`](./alpine-iso.yaml): ☆Alpine Linux (ISO9660 image). Compatible with the `alpine` template used in Lima prior to v1.0. diff --git a/templates/_images/almalinux-10.yaml b/templates/_images/almalinux-10.yaml new file mode 100644 index 00000000000..6f49d8a9ec8 --- /dev/null +++ b/templates/_images/almalinux-10.yaml @@ -0,0 +1,23 @@ +images: +- location: "https://repo.almalinux.org/almalinux/10.0/cloud/x86_64/images/AlmaLinux-10-GenericCloud-10.0-20250528.0.x86_64.qcow2" + arch: "x86_64" + digest: "sha256:9c528c5895c7fb5fc906add749d48057dbba4a4258a708c224aa3ef60fda14bd" +- location: "https://repo.almalinux.org/almalinux/10.0/cloud/aarch64/images/AlmaLinux-10-GenericCloud-10.0-20250528.0.aarch64.qcow2" + arch: "aarch64" + digest: "sha256:34f255fab5d82f5470b173016cf7265282f09fc36a0c50fde72c9a7166c450ea" +- location: "https://repo.almalinux.org/almalinux/10.0/cloud/s390x/images/AlmaLinux-10-GenericCloud-10.0-20250528.0.s390x.qcow2" + arch: "s390x" + digest: "sha256:a867b0ee9b9e537aa2d599430ee9be0808fc66f723dbf5937b204bfeb449b207" +# Fallback to the latest release image. +# Hint: run `limactl prune` to invalidate the cache + +- location: https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2 + arch: x86_64 + +- location: https://repo.almalinux.org/almalinux/10/cloud/aarch64/images/AlmaLinux-10-GenericCloud-latest.aarch64.qcow2 + arch: aarch64 + +- location: https://repo.almalinux.org/almalinux/10/cloud/s390x/images/AlmaLinux-10-GenericCloud-latest.s390x.qcow2 + arch: s390x + +mountTypesUnsupported: [9p] diff --git a/templates/almalinux-10.yaml b/templates/almalinux-10.yaml new file mode 100644 index 00000000000..eedc6322a9e --- /dev/null +++ b/templates/almalinux-10.yaml @@ -0,0 +1,5 @@ +minimumLimaVersion: 1.1.0 + +base: +- template://_images/almalinux-10 +- template://_default/mounts diff --git a/templates/almalinux.yaml b/templates/almalinux.yaml index 059f1143435..184e0561552 120000 --- a/templates/almalinux.yaml +++ b/templates/almalinux.yaml @@ -1 +1 @@ -almalinux-9.yaml \ No newline at end of file +almalinux-10.yaml \ No newline at end of file