Skip to content

Commit

Permalink
templates: Promote EL9 from experimental
Browse files Browse the repository at this point in the history
- 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]>
  • Loading branch information
AkihiroSuda committed Oct 18, 2022
1 parent a57ab54 commit 9058f58
Show file tree
Hide file tree
Showing 13 changed files with 104 additions and 98 deletions.
18 changes: 10 additions & 8 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@
Default: [`default.yaml`](./default.yaml) (⭐Ubuntu, with containerd/nerdctl)

Distro:
- [`almalinux.yaml`](./almalinux.yaml): AlmaLinux
- [`almalinux-9.yaml`](./almalinux-9.yaml), `almalinux.yaml`: AlmaLinux 9
- [`almalinux-8.yaml`](./almalinux-8.yaml): AlmaLinux 8
- [`alpine.yaml`](./alpine.yaml): ⭐Alpine Linux
- [`archlinux.yaml`](./archlinux.yaml): ⭐Arch Linux
- [`centos-stream.yaml`](./centos-stream.yaml): CentOS Stream 8
- [`centos-stream-9.yaml`](./centos-stream-9.yaml), `centos-stream.yaml`: CentOS Stream 9
- [`centos-stream-8.yaml`](./centos-stream-8.yaml): CentOS Stream 8
- [`debian.yaml`](./debian.yaml): ⭐Debian GNU/Linux
- [`fedora.yaml`](./fedora.yaml): ⭐Fedora
- [`opensuse.yaml`](./opensuse.yaml): ⭐openSUSE Leap
- [`oraclelinux.yaml`](./oraclelinux.yaml): Oracle Linux
- [`rocky.yaml`](./rocky.yaml): Rocky Linux
- [`oraclelinux-9.yaml`](./oraclelinux-9.yaml), `oraclelinux.yaml`: Oracle Linux 9
- [`oraclelinux-8.yaml`](./oraclelinux-8.yaml): Oracle Linux 8
- [`rocky-9.yaml`](./rocky-9.yaml), `rocky.yaml`: Rocky Linux 9
- [`rocky-8.yaml`](./rocky-8.yaml): Rocky Linux 8
- [`ubuntu.yaml`](./ubuntu.yaml): Ubuntu (same as `default.yaml` but without extra YAML lines)
- [`ubuntu-lts.yaml`](./ubuntu-lts.yaml): Ubuntu LTS (same as `ubuntu.yaml` but pinned to an LTS version)

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

## Tier 1

Expand Down
22 changes: 22 additions & 0 deletions examples/almalinux-8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This example requires Lima v0.8.3 or later.

# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
# EL9-based distros are known to work.

images:
- location: "http://repo.almalinux.org/almalinux/8.6/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.6-20220513.x86_64.qcow2"
arch: "x86_64"
digest: "sha256:1563c0b09d98e7a606e1e737f1c810830aeb0cbe37ac5585f3696be62f0a32b4"
- location: "http://repo.almalinux.org/almalinux/8.6/cloud/aarch64/images/AlmaLinux-8-GenericCloud-8.6-20220513.aarch64.qcow2"
arch: "aarch64"
digest: "sha256:d00960b398f257d83ade160eea954caf95a060ad5d74f3af9feeb17e0aa0b6e2"
mounts:
- location: "~"
- location: "/tmp/lima"
writable: true
firmware:
legacyBIOS: true
cpuType:
# Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
# https://bugs.launchpad.net/qemu/+bug/1838390
x86_64: "Haswell-v4"
File renamed without changes.
22 changes: 0 additions & 22 deletions examples/almalinux.yaml

This file was deleted.

1 change: 1 addition & 0 deletions examples/almalinux.yaml
22 changes: 22 additions & 0 deletions examples/centos-stream-8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This example requires Lima v0.8.3 or later.

# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
# EL9-based distros are known to work.

images:
- location: "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2"
arch: "x86_64"
digest: "sha256:a25560ab39e10594ee7a4a1dadcba7bf303b7c3c41559b4a7fc3c522540a6672"
- location: "https://cloud.centos.org/centos/8-stream/aarch64/images/CentOS-Stream-GenericCloud-8-20220125.1.aarch64.qcow2"
arch: "aarch64"
digest: "sha256:d973991085db0ca8373e1d9948440213cdc76b6acf8f17aa2aed2163c1347cbc"
mounts:
- location: "~"
- location: "/tmp/lima"
writable: true
firmware:
legacyBIOS: true
cpuType:
# Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
# https://bugs.launchpad.net/qemu/+bug/1838390
x86_64: "Haswell-v4"
File renamed without changes.
22 changes: 0 additions & 22 deletions examples/centos-stream.yaml

This file was deleted.

1 change: 1 addition & 0 deletions examples/centos-stream.yaml
24 changes: 24 additions & 0 deletions examples/oraclelinux-8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# This example requires Lima v0.9.0 or later.
# Oracle image licence: https://www.oracle.com/downloads/licenses/oracle-linux-license.html
# Image source: https://yum.oracle.com/oracle-linux-templates.html

# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
# EL9-based distros are known to work.

images:
- location: "https://yum.oracle.com/templates/OracleLinux/OL8/u6/x86_64/OL8U6_x86_64-kvm-b126.qcow"
arch: "x86_64"
digest: "sha256:f00bf07669b1b9b07de446140ed0ac4f3f310160104a41715cfa051d0ded3eed"
- location: "https://yum.oracle.com/templates/OracleLinux/OL8/u6/aarch64/OL8U6_aarch64-kvm-b2.qcow"
arch: "aarch64"
digest: "sha256:7fcf1765c5aa346be85eb8df0bc03d9e71b83dba6724fa7c41421be541d2ff93"
mounts:
- location: "~"
- location: "/tmp/lima"
writable: true
firmware:
legacyBIOS: true
cpuType:
# Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
# https://bugs.launchpad.net/qemu/+bug/1838390
x86_64: "Haswell-v4"
File renamed without changes.
24 changes: 0 additions & 24 deletions examples/oraclelinux.yaml

This file was deleted.

1 change: 1 addition & 0 deletions examples/oraclelinux.yaml
22 changes: 22 additions & 0 deletions examples/rocky-8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This example requires Lima v0.8.3 or later.

# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
# EL9-based distros are known to work.

images:
- location: "https://dl.rockylinux.org/pub/rocky/8.6/images/Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
arch: "x86_64"
digest: "sha256:7b786a39eeb96e22dd85386377ff186737f6c1b9a5faa105b0a0a7a4895c29d0"
- location: "https://dl.rockylinux.org/pub/rocky/8.6/images/Rocky-8-GenericCloud-8.6.20220702.0.aarch64.qcow2"
arch: "aarch64"
digest: "sha256:42da3cc0c10677d37e43f862c4a8f3ab3b72bcccc91ce0c0ef9f4100f4b950b4"
mounts:
- location: "~"
- location: "/tmp/lima"
writable: true
firmware:
legacyBIOS: true
cpuType:
# Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
# https://bugs.launchpad.net/qemu/+bug/1838390
x86_64: "Haswell-v4"
File renamed without changes.
22 changes: 0 additions & 22 deletions examples/rocky.yaml

This file was deleted.

1 change: 1 addition & 0 deletions examples/rocky.yaml

0 comments on commit 9058f58

Please sign in to comment.