Skip to content

Commit 3169e6c

Browse files
committed
templates: Promote EL9 from experimental
- Moved `rocky.yaml` to `rocky-8.yaml` - Moved `experimental/rocky-9.yaml` to `rocky-9.yaml` - Symlinked `rocky-9.yaml` to `rocky.yaml` Same for almalinux, oraclelinux, and centos-stream too. EL8 are now "soft" deprecated as they are known not to work on M1 (issue 841). If the issue is not going to be fixed in EL 8.7, maybe we should officially deprecate EL8. Fix issue 1099 Signed-off-by: Akihiro Suda <[email protected]>
1 parent 2bbf428 commit 3169e6c

13 files changed

+104
-98
lines changed

examples/README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
Default: [`default.yaml`](./default.yaml) (⭐Ubuntu, with containerd/nerdctl)
66

77
Distro:
8-
- [`almalinux.yaml`](./almalinux.yaml): AlmaLinux
8+
- [`almalinux-8.yaml`](./almalinux-8.yaml): AlmaLinux 8
9+
- [`almalinux-9.yaml`](./almalinux-9.yaml), `almalinux.yaml`: AlmaLinux 9
910
- [`alpine.yaml`](./alpine.yaml): ⭐Alpine Linux
1011
- [`archlinux.yaml`](./archlinux.yaml): ⭐Arch Linux
11-
- [`centos-stream.yaml`](./centos-stream.yaml): CentOS Stream 8
12+
- [`centos-stream-8.yaml`](./centos-stream-8.yaml): CentOS Stream 8
13+
- [`centos-stream-9.yaml`](./centos-stream-9.yaml), `centos-stream.yaml`: CentOS Stream 9
1214
- [`debian.yaml`](./debian.yaml): ⭐Debian GNU/Linux
1315
- [`fedora.yaml`](./fedora.yaml): ⭐Fedora
1416
- [`opensuse.yaml`](./opensuse.yaml): ⭐openSUSE Leap
15-
- [`oraclelinux.yaml`](./oraclelinux.yaml): Oracle Linux
16-
- [`rocky.yaml`](./rocky.yaml): Rocky Linux
17+
- [`oraclelinux-8.yaml`](./oraclelinux-8.yaml): Oracle Linux 8
18+
- [`oraclelinux-9.yaml`](./oraclelinux-9.yaml), `oraclelinux.yaml`: Oracle Linux 9
19+
- [`rocky-8.yaml`](./rocky-8.yaml): Rocky Linux 8
20+
- [`rocky-9.yaml`](./rocky-9.yaml), `rocky.yaml`: Rocky Linux 9
1721
- [`ubuntu.yaml`](./ubuntu.yaml): Ubuntu (same as `default.yaml` but without extra YAML lines)
1822
- [`ubuntu-lts.yaml`](./ubuntu-lts.yaml): Ubuntu LTS (same as `ubuntu.yaml` but pinned to an LTS version)
1923

@@ -38,10 +42,6 @@ Container orchestration:
3842
Others:
3943
- [`vmnet.yaml`](./vmnet.yaml): ⭐enable [`vmnet.framework`](../docs/network.md)
4044
- [`deprecated/centos-7.yaml`](./deprecated/centos-7.yaml): [deprecated] CentOS Linux 7
41-
- [`experimental/almalinux-9.yaml`](experimental/almalinux-9.yaml): [experimental] AlmaLinux 9
42-
- [`experimental/rocky-9.yaml`](experimental/rocky-9.yaml): [experimental] Rocky Linux 9
43-
- [`experimental/oraclelinux-9.yaml`](experimental/oraclelinux-9.yaml): [experimental] Oracle Linux 9
44-
- [`experimental/centos-stream-9.yaml`](experimental/centos-stream-9.yaml): [experimental] CentOS Stream 9
4545
- [`experimental/opensuse-tumbleweed.yaml`](experimental/opensuse-tumbleweed.yaml): [experimental] openSUSE Tumbleweed
4646
- [`experimental/9p.yaml`](experimental/9p.yaml): [experimental] use 9p mount type
4747
- [`experimental/riscv64.yaml`](experimental/riscv64.yaml): [experimental] RISC-V
@@ -52,6 +52,8 @@ Lost+found:
5252
and [`centos-stream.yaml`](./centos-stream.yaml).
5353
- ~`singularity.yaml`~: Moved to [`apptainer-rootful.yaml`](./apptainer-rootful.yaml) in Lima v0.13.0, as Singularity was renamed to Apptainer.
5454
- ~`experimental/apptainer.yaml`~: Moved to [`apptainer.yaml`](./apptainer.yaml) in Lima v0.13.0
55+
- ~`experimental/{almalinux,centos-stream-9,oraclelinux,rocky}-9.yaml`~: Moved to [`almalinux-9.yaml`](./almalinux.yaml), [`centos-stream-9.yaml`](./centos-stream-9.yaml),
56+
[`oraclelinux-9.yaml`](./oraclelinux-9.yaml), and [`rocky-9.yaml`](./rocky-9.yaml) in Lima v0.13.0.
5557

5658
## Tier 1
5759

examples/almalinux-8.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# This example requires Lima v0.8.3 or later.
2+
3+
# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
4+
# EL9-based distros are known to work.
5+
6+
images:
7+
- location: "http://repo.almalinux.org/almalinux/8.6/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.6-20220513.x86_64.qcow2"
8+
arch: "x86_64"
9+
digest: "sha256:1563c0b09d98e7a606e1e737f1c810830aeb0cbe37ac5585f3696be62f0a32b4"
10+
- location: "http://repo.almalinux.org/almalinux/8.6/cloud/aarch64/images/AlmaLinux-8-GenericCloud-8.6-20220513.aarch64.qcow2"
11+
arch: "aarch64"
12+
digest: "sha256:d00960b398f257d83ade160eea954caf95a060ad5d74f3af9feeb17e0aa0b6e2"
13+
mounts:
14+
- location: "~"
15+
- location: "/tmp/lima"
16+
writable: true
17+
firmware:
18+
legacyBIOS: true
19+
cpuType:
20+
# Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
21+
# https://bugs.launchpad.net/qemu/+bug/1838390
22+
x86_64: "Haswell-v4"
File renamed without changes.

examples/almalinux.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

examples/almalinux.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
almalinux-9.yaml

examples/centos-stream-8.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# This example requires Lima v0.8.3 or later.
2+
3+
# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
4+
# EL9-based distros are known to work.
5+
6+
images:
7+
- location: "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2"
8+
arch: "x86_64"
9+
digest: "sha256:a25560ab39e10594ee7a4a1dadcba7bf303b7c3c41559b4a7fc3c522540a6672"
10+
- location: "https://cloud.centos.org/centos/8-stream/aarch64/images/CentOS-Stream-GenericCloud-8-20220125.1.aarch64.qcow2"
11+
arch: "aarch64"
12+
digest: "sha256:d973991085db0ca8373e1d9948440213cdc76b6acf8f17aa2aed2163c1347cbc"
13+
mounts:
14+
- location: "~"
15+
- location: "/tmp/lima"
16+
writable: true
17+
firmware:
18+
legacyBIOS: true
19+
cpuType:
20+
# Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
21+
# https://bugs.launchpad.net/qemu/+bug/1838390
22+
x86_64: "Haswell-v4"

examples/centos-stream.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

examples/centos-stream.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
centos-stream-9.yaml

examples/oraclelinux-8.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# This example requires Lima v0.9.0 or later.
2+
# Oracle image licence: https://www.oracle.com/downloads/licenses/oracle-linux-license.html
3+
# Image source: https://yum.oracle.com/oracle-linux-templates.html
4+
5+
# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
6+
# EL9-based distros are known to work.
7+
8+
images:
9+
- location: "https://yum.oracle.com/templates/OracleLinux/OL8/u6/x86_64/OL8U6_x86_64-kvm-b126.qcow"
10+
arch: "x86_64"
11+
digest: "sha256:f00bf07669b1b9b07de446140ed0ac4f3f310160104a41715cfa051d0ded3eed"
12+
- location: "https://yum.oracle.com/templates/OracleLinux/OL8/u6/aarch64/OL8U6_aarch64-kvm-b2.qcow"
13+
arch: "aarch64"
14+
digest: "sha256:7fcf1765c5aa346be85eb8df0bc03d9e71b83dba6724fa7c41421be541d2ff93"
15+
mounts:
16+
- location: "~"
17+
- location: "/tmp/lima"
18+
writable: true
19+
firmware:
20+
legacyBIOS: true
21+
cpuType:
22+
# Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
23+
# https://bugs.launchpad.net/qemu/+bug/1838390
24+
x86_64: "Haswell-v4"

examples/oraclelinux.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

examples/oraclelinux.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oraclelinux-9.yaml

examples/rocky-8.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# This example requires Lima v0.8.3 or later.
2+
3+
# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
4+
# EL9-based distros are known to work.
5+
6+
images:
7+
- location: "https://dl.rockylinux.org/pub/rocky/8.6/images/Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
8+
arch: "x86_64"
9+
digest: "sha256:7b786a39eeb96e22dd85386377ff186737f6c1b9a5faa105b0a0a7a4895c29d0"
10+
- location: "https://dl.rockylinux.org/pub/rocky/8.6/images/Rocky-8-GenericCloud-8.6.20220702.0.aarch64.qcow2"
11+
arch: "aarch64"
12+
digest: "sha256:42da3cc0c10677d37e43f862c4a8f3ab3b72bcccc91ce0c0ef9f4100f4b950b4"
13+
mounts:
14+
- location: "~"
15+
- location: "/tmp/lima"
16+
writable: true
17+
firmware:
18+
legacyBIOS: true
19+
cpuType:
20+
# Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
21+
# https://bugs.launchpad.net/qemu/+bug/1838390
22+
x86_64: "Haswell-v4"
File renamed without changes.

examples/rocky.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

examples/rocky.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rocky-9.yaml

0 commit comments

Comments
 (0)