diff --git a/README.ja.md b/README.ja.md index f9f11ccfa226..f016a543654c 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,8 +1,8 @@ -This is an *informal* translation of [`README.md` (revision df8bf9e7, 2022-Sep-23)](https://github.com/lima-vm/lima/blob/df8bf9e7ff198b01cd877ed425a73cbbaf8dec3b/README.md) in Japanese. +This is an *informal* translation of [`README.md` (revision 725d7dca, 2022-Oct-8)](https://github.com/lima-vm/lima/blob/725d7dcac3e641905a444777bce8a65190db1692/README.md) in Japanese. This translation might be out of sync with the English version. Please refer to the [English `README.md`](README.md) for the latest information. -[`README.md` (リビジョン df8bf9e7, 2022年9月23日)](https://github.com/lima-vm/lima/blob/df8bf9e7ff198b01cd877ed425a73cbbaf8dec3b/README.md)の *非正式* な日本語訳です。 +[`README.md` (リビジョン 725d7dca, 2022年10月8日)](https://github.com/lima-vm/lima/blob/725d7dcac3e641905a444777bce8a65190db1692/README.md)の *非正式* な日本語訳です。 英語版からの翻訳が遅れていることがあります。 最新の情報については[英語版 `README.md`](README.md)をご覧ください。 @@ -342,7 +342,7 @@ AlmaLinux, Alpine, Arch Linux, Debian, Fedora, openSUSE, Oracle Linux, Rocky が コンテナランタイムの例: - [`./examples/docker.yaml`](./examples/docker.yaml): Docker - [`./examples/podman.yaml`](./examples/podman.yaml): Podman -- [`./examples/singularity.yaml`](./examples/singularity.yaml): Singularity +- [`./examples/apptainer.yaml`](./examples/apptainer.yaml): Apptainer コンテナイメージビルダの例: - [`./examples/buildkit.yaml`](./examples/buildkit.yaml): BuildKit diff --git a/README.md b/README.md index 34c64b383ee3..1d95f01d76c3 100644 --- a/README.md +++ b/README.md @@ -334,7 +334,7 @@ Yes, any container engine should work with Lima. Container runtime examples: - [`./examples/docker.yaml`](./examples/docker.yaml): Docker - [`./examples/podman.yaml`](./examples/podman.yaml): Podman -- [`./examples/singularity.yaml`](./examples/singularity.yaml): Singularity +- [`./examples/apptainer.yaml`](./examples/apptainer.yaml): Apptainer Container image builder examples: - [`./examples/buildkit.yaml`](./examples/buildkit.yaml): BuildKit diff --git a/examples/README.md b/examples/README.md index 973e90e7ccee..f041740d0760 100644 --- a/examples/README.md +++ b/examples/README.md @@ -8,7 +8,6 @@ Distro: - [`almalinux.yaml`](./almalinux.yaml): AlmaLinux - [`alpine.yaml`](./alpine.yaml): ⭐Alpine Linux - [`archlinux.yaml`](./archlinux.yaml): ⭐Arch Linux -- centos.yaml: ~~CentOS Linux 8~~ ([EOL](https://www.centos.org/centos-linux-eol/)) - [`centos-stream.yaml`](./centos-stream.yaml): CentOS Stream 8 - [`debian.yaml`](./debian.yaml): ⭐Debian GNU/Linux - [`fedora.yaml`](./fedora.yaml): ⭐Fedora @@ -23,7 +22,8 @@ Container engines: - [`docker-rootful.yaml`](./docker-rootful.yaml): Docker (rootful) - [`podman.yaml`](./podman.yaml): Podman - [`podman-rootful.yaml`](./podman-rootful.yaml): Podman (rootful) -- [`singularity.yaml`](./singularity.yaml): Singularity +- [`apptainer.yaml`](./apptainer.yaml): Apptainer +- [`apptainer-rootful.yaml`](./apptainer-rootful.yaml): Apptainer (rootful) - LXD is installed in the default Ubuntu template, so there is no `lxd.yaml` Container image builders: @@ -45,7 +45,13 @@ Others: - [`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 -- [`experimental/apptainer.yaml`](./experimental/apptainer.yaml): [experimental] [Apptainer](https://apptainer.org/) + +Lost+found: +- ~`centos.yaml`~: Removed in Lima v0.8.0, as CentOS 8 reached [EOL](https://www.centos.org/centos-linux-eol/). + Replaced by [`rocky.yaml`](./rocky.yaml), [`almalinux.yaml`](./almalinux.yaml), [`oraclelinux.yaml`](./oraclelinux.yaml), + and [`centos-stream.yaml`](./centos-stream.yaml). +- ~`singularity.yaml`~: Moved to [`apptainer-rootful.yaml`](./apptainer-rootful.yaml) in Lima v0.12.1, as Singularity was renamed to Apptainer. +- ~`experimental/apptainer.yaml`~: Moved to [`apptainer.yaml`](./apptainer.yaml) in Lima v0.12.1 ## Tier 1 diff --git a/examples/singularity.yaml b/examples/apptainer-rootful.yaml similarity index 60% rename from examples/singularity.yaml rename to examples/apptainer-rootful.yaml index 4caf628ba87f..5386f4aeb563 100644 --- a/examples/singularity.yaml +++ b/examples/apptainer-rootful.yaml @@ -1,9 +1,9 @@ -# Example to use Singularity instead of containerd & nerdctl -# $ limactl start ./singularity.yaml -# $ limactl shell singularity singularity run -u -B $HOME:$HOME docker://alpine +# Example to use Apptainer instead of containerd & nerdctl +# $ limactl start ./apptainer-rootful.yaml +# $ limactl shell apptainer-rootful apptainer run -u -B $HOME:$HOME docker://alpine -# Fedora provides Singularity in the default dnf. -# Ubuntu does not seem to provide Singularity in the default apt. +# Fedora provides Apptainer in the default dnf. +# Ubuntu does not seem to provide Apptainer in the default apt. images: - location: "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2" arch: "x86_64" @@ -29,14 +29,14 @@ provision: script: | #!/bin/bash set -eux -o pipefail - command -v singularity >/dev/null 2>&1 && exit 0 - dnf install -y singularity + command -v apptainer >/dev/null 2>&1 && exit 0 + dnf -y install apptainer apptainer-suid probes: - script: | #!/bin/bash set -eux -o pipefail - if ! timeout 30s bash -c "until command -v singularity >/dev/null 2>&1; do sleep 3; done"; then - echo >&2 "singularity is not installed yet" + if ! timeout 30s bash -c "until command -v apptainer >/dev/null 2>&1; do sleep 3; done"; then + echo >&2 "apptainer is not installed yet" exit 1 fi - hint: See "/var/log/cloud-init-output.log". in the guest + hint: See "/var/log/cloud-init-output.log" in the guest diff --git a/examples/apptainer.yaml b/examples/apptainer.yaml new file mode 100644 index 000000000000..503001c012cf --- /dev/null +++ b/examples/apptainer.yaml @@ -0,0 +1,36 @@ +# Example to use Apptainer instead of containerd & nerdctl +# $ limactl start ./apptainer.yaml +# $ limactl shell apptainer apptainer run -u -B $HOME:$HOME docker://alpine + +# Fedora provides Apptainer in the default dnf. +# Ubuntu does not seem to provide Apptainer in the default apt. +images: +- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2" + arch: "x86_64" + digest: "sha256:ca9e514cc2f4a7a0188e7c68af60eb4e573d2e6850cc65b464697223f46b4605" +- location: "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/aarch64/images/Fedora-Cloud-Base-36-1.5.aarch64.qcow2" + arch: "aarch64" + digest: "sha256:5c0e7e99b0c542cb2155cd3b52bbf51a42a65917e52d37df457d1e9759b37512" +mounts: +- location: "~" +- location: "/tmp/lima" + writable: true +containerd: + system: false + user: false +provision: +- mode: system + script: | + #!/bin/bash + set -eux -o pipefail + command -v apptainer >/dev/null 2>&1 && exit 0 + dnf -y install apptainer +probes: +- script: | + #!/bin/bash + set -eux -o pipefail + if ! timeout 30s bash -c "until command -v apptainer >/dev/null 2>&1; do sleep 3; done"; then + echo >&2 "apptainer is not installed yet" + exit 1 + fi + hint: See "/var/log/cloud-init-output.log" in the guest diff --git a/examples/experimental/apptainer.yaml b/examples/experimental/apptainer.yaml deleted file mode 100644 index 6f5ff52d1655..000000000000 --- a/examples/experimental/apptainer.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# Example to use Apptainer instead of containerd & nerdctl -# $ limactl start ./apptainer.yaml -# $ limactl shell apptainer apptainer run -u -B $HOME:$HOME docker://alpine - -# This example requires Lima v0.8.3 or later. - -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" -containerd: - system: false - user: false -provision: -- mode: system - script: | - #!/bin/bash - set -eux -o pipefail - command -v apptainer >/dev/null 2>&1 && exit 0 - dnf install -y yum-utils epel-release - dnf install -y squashfuse fakeroot - yum-config-manager --disable epel* - dnf install --enablerepo=epel-testing -y apptainer apptainer-suid -probes: -- script: | - #!/bin/bash - set -eux -o pipefail - if ! timeout 30s bash -c "until command -v apptainer >/dev/null 2>&1; do sleep 3; done"; then - echo >&2 "apptainer is not installed yet" - exit 1 - fi - hint: See "/var/log/cloud-init-output.log". in the guest