Skip to content

Commit e5212d2

Browse files
authored
Merge pull request #361 from AkihiroSuda/update-docs-20211022
README.md: update
2 parents ce8ef63 + 763722e commit e5212d2

File tree

2 files changed

+33
-16
lines changed

2 files changed

+33
-16
lines changed

README.md

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Lima is expected to be used on macOS hosts, but can be used on Linux hosts as we
2323

2424
✅ Intel on ARM
2525

26-
✅ Various guest Linux distributions: [Ubuntu](./examples/ubuntu.yaml), [Debian](./examples/debian.yaml), [Fedora](./examples/fedora.yaml), [Alpine](./examples/alpine.yaml), [Arch Linux](./examples/archlinux.yaml), [openSUSE](./examples/opensuse.yaml)...
26+
✅ Various guest Linux distributions: [Alpine](./examples/alpine.yaml), [Arch Linux](./examples/archlinux.yaml), [CentOS](./examples/centos.yaml), [Debian](./examples/debian.yaml), [Fedora](./examples/fedora.yaml), [openSUSE](./examples/opensuse.yaml), [Ubuntu](./examples/ubuntu.yaml) (default), ...
2727

2828
Related project: [sshocker (ssh with file sharing and port forwarding)](https://github.com/lima-vm/sshocker)
2929

@@ -40,8 +40,9 @@ Container environments:
4040
- [Rancher Desktop](https://rancherdesktop.io/): Kubernetes and container management to the desktop
4141
- [Colima](https://github.com/abiosoft/colima): Docker (and Kubernetes) on macOS with minimal setup
4242

43-
Misc:
44-
- [Lima xbar plugin](https://github.com/unixorn/lima-xbar-plugin) - [xbar](https://xbarapp.com/) plugin to start/stop VMs from the menu bar and see their running status.
43+
GUI:
44+
- [Lima xbar plugin](https://github.com/unixorn/lima-xbar-plugin): [xbar](https://xbarapp.com/) plugin to start/stop VMs from the menu bar and see their running status.
45+
- [lima-gui](https://github.com/afbjorklund/lima-gui): Qt GUI for Lima
4546

4647
## Examples
4748

@@ -96,7 +97,7 @@ $ brew install lima
9697

9798
Install recent version of QEMU. v6.1.0 or later is recommended.
9899

99-
On ARM hosts, a [patched](https://patchwork.kernel.org/series/548227/mbox/) version of QEMU has to be installed for enabling `-accel hvf` support.
100+
On ARM Mac hosts, a [patched](https://patchwork.kernel.org/series/548227/mbox/) version of QEMU has to be installed for enabling `-accel hvf` support.
100101

101102
The patch was merged into the master branch on [2021-09-21](https://github.com/qemu/qemu/commit/81ceb36b9) and will be included in QEMU v6.2.0.
102103

@@ -153,6 +154,8 @@ Detailed usage:
153154

154155
- To enable bash completion, add `source <(limactl completion bash)` to `~/.bash_profile`.
155156

157+
- To enable zsh completion, see `limactl completion zsh --help`
158+
156159
### :warning: CAUTION: make sure to back up your data
157160
Lima may have bugs that result in loss of data.
158161

@@ -178,7 +181,7 @@ The current default spec:
178181
## How it works
179182

180183
- Hypervisor: QEMU with HVF accelerator
181-
- Filesystem sharing: [reverse sshfs](https://github.com/lima-vm/sshocker/blob/v0.2.0/pkg/reversesshfs/reversesshfs.go) (planned to be replaced with 9p soon)
184+
- Filesystem sharing: [reverse sshfs](https://github.com/lima-vm/sshocker/blob/v0.2.0/pkg/reversesshfs/reversesshfs.go) (likely to be replaced with 9p or Samba in future)
182185
- Port forwarding: `ssh -L`, automated by watching `/proc/net/tcp` and `iptables` events in the guest
183186

184187
## Developer guide
@@ -195,7 +198,6 @@ The current default spec:
195198
- Performance optimization
196199
- More guest distros
197200
- Windows hosts
198-
- GUI with system tray icon (Qt or Electron, for portability)
199201
- [VirtFS to replace the current reverse sshfs (work has to be done on QEMU repo)](https://github.com/NixOS/nixpkgs/pull/122420)
200202
- [vsock](https://github.com/apple/darwin-xnu/blob/xnu-7195.81.3/bsd/man/man4/vsock.4) to replace SSH (work has to be done on QEMU repo)
201203

@@ -210,13 +212,14 @@ The current default spec:
210212
- ["What's my login password?"](#whats-my-login-password)
211213
- ["Does Lima work on ARM Mac?"](#does-lima-work-on-arm-mac)
212214
- ["Can I run non-Ubuntu guests?"](#can-i-run-non-ubuntu-guests)
213-
- ["Can I run other container engines such as Docker and Podman?"](#can-i-run-other-container-engines-such-as-docker-and-podman)
215+
- ["Can I run other container engines such as Docker and Podman? What about Kubernetes?"](#can-i-run-other-container-engines-such-as-docker-and-podman-what-about-kubernetes)
214216
- ["Can I run Lima with a remote Linux machine?"](#can-i-run-lima-with-a-remote-linux-machine)
215217
- ["Advantages compared to Docker for Mac?"](#advantages-compared-to-docker-for-mac)
216218
- [QEMU](#qemu)
217219
- ["QEMU crashes with `HV_ERROR`"](#qemu-crashes-with-hv_error)
218220
- ["QEMU is slow"](#qemu-is-slow)
219221
- [error "killed -9"](#error-killed--9)
222+
- ["QEMU crashes with `vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed`"](#qemu-crashes-with-vmx_write_mem-mmu_gva_to_gpa-xxxxxxxxxxxxxxxx-failed)
220223
- [SSH](#ssh)
221224
- ["Port forwarding does not work"](#port-forwarding-does-not-work)
222225
- [stuck on "Waiting for the essential requirement 1 of X: "ssh"](#stuck-on-waiting-for-the-essential-requirement-1-of-x-ssh)
@@ -237,7 +240,7 @@ Alternatively, you may also directly ssh into the guest: `ssh -p 60022 -i ~/.lim
237240
Yes, it should work, but not regularly tested on ARM (due to lack of CI).
238241

239242
#### "Can I run non-Ubuntu guests?"
240-
Debian, Fedora, Alpine, Arch Linux, and openSUSE are also known to work.
243+
Alpine, Arch Linux, CentOS, Debian, Fedora, and openSUSE are also known to work.
241244
See [`./examples/`](./examples/).
242245

243246
An image has to satisfy the following requirements:
@@ -250,16 +253,25 @@ An image has to satisfy the following requirements:
250253
- `newuidmap` and `newgidmap`
251254
- `apt-get`, `dnf`, `apk`, `pacman`, or `zypper` (if you want to contribute support for another package manager, run `git grep apt-get` to find out where to modify)
252255

253-
#### "Can I run other container engines such as Docker and Podman?"
256+
#### "Can I run other container engines such as Docker and Podman? What about Kubernetes?"
254257
Yes, any container engine should work with Lima.
255258

256-
See examples:
257-
- [`./examples/docker.yaml`](./examples/docker.yaml)
258-
- [`./examples/podman.yaml`](./examples/podman.yaml)
259-
- [`./examples/singularity.yaml`](./examples/singularity.yaml)
259+
Container runtime examples:
260+
- [`./examples/docker.yaml`](./examples/docker.yaml): Docker
261+
- [`./examples/podman.yaml`](./examples/podman.yaml): Podman
262+
- [`./examples/singularity.yaml`](./examples/singularity.yaml): Singularity
263+
264+
Container orchestrator examples:
265+
- [`./examples/k3s.yaml`](./examples/k3s.yaml): Kubernetes (k3s)
266+
- [`./examples/k8s.yaml`](./examples/k8s.yaml): Kubernetes (kubeadm)
267+
- [`./examples/nomad.yaml`](./examples/nomad.yaml): Nomad
260268

261269
The default Ubuntu image also contains LXD. Run`lima sudo lxc init` to set up LXD.
262270

271+
See also third party containerd projects based on Lima:
272+
- [Rancher Desktop](https://rancherdesktop.io/): Kubernetes and container management to the desktop
273+
- [Colima](https://github.com/abiosoft/colima): Docker (and Kubernetes) on macOS with minimal setup
274+
263275
#### "Can I run Lima with a remote Linux machine?"
264276
Lima itself does not support connecting to a remote Linux machine, but [sshocker](https://github.com/lima-vm/sshocker),
265277
the predecessor or Lima, provides similar features for remote Linux machines.
@@ -312,6 +324,11 @@ Note: **Only** on macOS versions **before** 10.15.7 you might need to add this e
312324
- make sure qemu is codesigned, See ["QEMU crashes with `HV_ERROR`"](#qemu-crashes-with-hv_error).
313325
- if you are on macOS 10.15.7 or 11.0 or later make sure the entitlement `com.apple.vm.hypervisor` is **not** added. It only works on older macOS versions. You can clear the codesigning with `codesign --remove-signature /usr/local/bin/qemu-system-x86_64` and [start over](#getting-started).
314326

327+
#### "QEMU crashes with `vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed`"
328+
This error is known to happen when running an image of RHEL8-compatible distribution such as CentOS 8 on Intel Mac.
329+
A workaround is to set environment variable `QEMU_SYSTEM_X86_64="qemu-system-x86_64 -cpu Haswell-v4"`.
330+
331+
https://bugs.launchpad.net/qemu/+bug/1838390
315332

316333
### SSH
317334
#### "Port forwarding does not work"

examples/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ Default: [`default.yaml`](../pkg/limayaml/default.yaml) (Ubuntu, with containerd
55
Distro:
66
- [`alpine.yaml`](./alpine.yaml): Alpine Linux
77
- [`archlinux.yaml`](./archlinux.yaml): Arch Linux
8+
- [`centos.yaml`](./centos.yaml): CentOS Linux
89
- [`debian.yaml`](./debian.yaml): Debian GNU/Linux
910
- [`fedora.yaml`](./fedora.yaml): Fedora
10-
- [`centos.yaml`](./centos.yaml): CentOS Linux
1111
- [`opensuse.yaml`](./opensuse.yaml): openSUSE Leap
12-
- [`ubuntu.yaml`](./ubuntu.yaml): Ubuntu (same as `default.yaml` but without bogus YAML lines)
12+
- [`ubuntu.yaml`](./ubuntu.yaml): Ubuntu (same as `default.yaml` but without extra YAML lines)
1313

1414
Container engines:
1515
- [`docker.yaml`](./docker.yaml): Docker
@@ -18,8 +18,8 @@ Container engines:
1818
- LXD is installed in the default Ubuntu template, so there is no `lxd.yaml`
1919

2020
Container orchestration:
21-
- [`k8s.yaml`](./k8s.yaml): Kubernetes via kubeadm
2221
- [`k3s.yaml`](./k3s.yaml): Kubernetes via k3s
22+
- [`k8s.yaml`](./k8s.yaml): Kubernetes via kubeadm
2323
- [`nomad.yaml`](./nomad.yaml): Nomad
2424

2525
Others:

0 commit comments

Comments
 (0)