Merge branch 'master' into volume

Author: sam-berning

.github/ISSUE_TEMPLATE/config.yml

@@ -4,5 +4,5 @@ contact_links:
   url: https://github.com/lima-vm/lima/discussions
   about: We use GitHub Discussions for questions, GitHub issues for tracking bug reports and feature requests
 - name: Chat with Lima users and developers
-  url: https://slack.rancher.io/
-  about: Rancher Users slack has `#lima` channel, colocated with `#rancher-desktop` channel (Lima is not a Rancher project)
+  url: https://slack.cncf.io/
+  about: CNCF slack has `#lima` channel

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.48.0
+        version: v1.49.0
         args: --verbose
     - name: Run yamllint
       run: yamllint .
@@ -39,7 +39,7 @@ jobs:
     - name: Check hyperlinks
       uses: docker://dkhamsing/awesome_bot:latest
       with:
-        args: /github/workspace/README.md --allow-dupe --allow-redirect --request-delay 1 --white-list https://img.shields.io,http://127.0.0.1:8080,https://github.com/lima-vm/lima/releases/download
+        args: /github/workspace/README.md --allow-dupe --allow-redirect --request-delay 1 --white-list https://img.shields.io,http://127.0.0.1:8080,https://github.com/lima-vm/lima/releases/download,https://xbarapp.com
     - name: Unit tests
       run: go test -v ./...
     - name: Make

.golangci.yml

@@ -22,7 +22,6 @@ run:
 linters:
   disable-all: true
   enable:
-  - deadcode
   - depguard
   - gofmt
   - goimports
@@ -31,9 +30,7 @@ linters:
   - misspell
   - nakedret
   # - prealloc
-  - structcheck
   - typecheck
-  - varcheck
   # - asciicheck
   # - bodyclose
   # - dogsled
@@ -76,9 +73,10 @@ linters:
   # - stylecheck
   # - testpackage
   # - tparallel
+  - revive
   # - unconvert
   # - unparam
-  # - unused
+  - unused
   # - whitespace
   # - wrapcheck
   # - wsl

Makefile

@@ -31,6 +31,7 @@ binaries: clean \
 	_output/bin/lima$(bat) \
 	_output/bin/limactl$(exe) \
 	_output/bin/nerdctl.lima \
+	_output/bin/apptainer.lima \
 	_output/bin/docker.lima \
 	_output/bin/podman.lima \
 	_output/share/lima/lima-guestagent.Linux-x86_64 \
@@ -62,6 +63,10 @@ _output/bin/nerdctl.lima:
 	mkdir -p _output/bin
 	cp -a ./cmd/nerdctl.lima $@
 
+_output/bin/apptainer.lima: ./cmd/apptainer.lima
+	@mkdir -p _output/bin
+	cp -a $^ $@
+
 _output/bin/docker.lima: ./cmd/docker.lima
 	@mkdir -p _output/bin
 	cp -a $^ $@
@@ -102,6 +107,7 @@ install: uninstall
 	# Use tar rather than cp, for better symlink handling
 	( cd _output && tar c * | tar Cxv "$(DEST)" )
 	if [ "$(shell uname -s )" != "Linux" -a ! -e "$(DEST)/bin/nerdctl" ]; then ln -sf nerdctl.lima "$(DEST)/bin/nerdctl"; fi
+	if [ "$(shell uname -s )" != "Linux" -a ! -e "$(DEST)/bin/apptainer" ]; then ln -sf apptainer.lima "$(DEST)/bin/apptainer"; fi
 
 .PHONY: uninstall
 uninstall:
@@ -111,10 +117,12 @@ uninstall:
 		"$(DEST)/bin/lima$(bat)" \
 		"$(DEST)/bin/limactl$(exe)" \
 		"$(DEST)/bin/nerdctl.lima" \
+		"$(DEST)/bin/apptainer.lima" \
 		"$(DEST)/bin/docker.lima" \
 		"$(DEST)/bin/podman.lima" \
 		"$(DEST)/share/lima" "$(DEST)/share/doc/lima"
 	if [ "$$(readlink "$(DEST)/bin/nerdctl")" = "nerdctl.lima" ]; then rm "$(DEST)/bin/nerdctl"; fi
+	if [ "$$(readlink "$(DEST)/bin/apptainer")" = "apptainer.lima" ]; then rm "$(DEST)/bin/apptainer"; fi
 
 .PHONY: lint
 lint:

README.ja.md

@@ -1,8 +1,8 @@
-This is an *informal* translation of [`README.md` (revision 0aebc304, 2022-Apr-25)](https://github.com/lima-vm/lima/blob/0aebc304f8cdc65375f8bfca7414ced6397a4fcc/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` (リビジョン 0aebc304, 2022年4月25日)](https://github.com/lima-vm/lima/blob/0aebc304f8cdc65375f8bfca7414ced6397a4fcc/README.md)の *非正式* な日本語訳です。
+[`README.md` (リビジョン 725d7dca, 2022年10月8日)](https://github.com/lima-vm/lima/blob/725d7dcac3e641905a444777bce8a65190db1692/README.md)の *非正式* な日本語訳です。
 英語版からの翻訳が遅れていることがあります。
 最新の情報については[英語版 `README.md`](README.md)をご覧ください。
 
@@ -41,6 +41,8 @@ LimaはmacOSホストで使用されることを想定していますが、Linux
 
 このプロジェクトは[Limaドライバプロジェクト (ARM Mali GPUのためのドライバ)](https://gitlab.freedesktop.org/lima)とは無関係です。
 
+Limaに関する講演のスライド及びビデオへのリンクが[talks](docs/talks.md)のページにあります。
+
 ## 動機
 
 Limaの目的は、Macユーザに[nerdctl (contaiNERDctl)](https://github.com/containerd/nerdctl)を含め[containerd](https://containerd.io)を広めることです。が、Limaではコンテナでないアプリケーションも使用できます。
@@ -59,9 +61,12 @@ GUI:
 
 ### コミュニケーション方法
 - [GitHub Discussions](https://github.com/lima-vm/lima/discussions)
-- Rancher Users Slackで`#rancher-desktop`チャンネルと同居している`#lima`チャンネル( LimaはRancherのプロジェクトではありません )
-  - 新規アカウント: https://slack.rancher.io/
-  - ログイン: https://rancher-users.slack.com/
+- CNCF Slackの`#lima`チャンネル
+  - 新規アカウント: https://slack.cncf.io/
+  - ログイン: https://cloud-native.slack.com/
+
+### 行動規範
+Limaは[CNCF行動規範](https://github.com/cncf/foundation/blob/master/code-of-conduct.md)に従います。
 
 ## 例
 
@@ -337,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
@@ -438,7 +443,8 @@ M1のmacOSでは、最近のLinuxゲストを実行するには[Homebrew版のQE
 
 デフォルトのIP 192.168.5.15 はホストや他のゲストからアクセスできません。
 
-ホストや他の仮想マシンからアクセス可能な別のIPアドレスを追加するためには、[`vde_vmnet`](https://github.com/lima-vm/vde_vmnet)を有効にしてください。
+ホストや他の仮想マシンからアクセス可能な別のIPアドレスを追加するためには、[`socket_vmnet`](https://github.com/lima-vm/socket_vmnet) (Lima v0.12以降)
+または [`vde_vmnet`](https://github.com/lima-vm/vde_vmnet) (廃止予定) を有効にしてください。
 
 [`./docs/network.md`](./docs/network.md)を参照してください。
 
@@ -487,3 +493,11 @@ LIMA_HOME="$HOME/.local/share/rancher-desktop/lima" "$(ls -d /tmp/.mount_ranche*
   - `/var/log/cloud-init-output.log` (ゲスト内)
   - `/var/log/cloud-init.log` (ゲスト内)
 - YAML内にタブとスペースを混在させていないことを確認してください。
+
+- - -
+
+**私たちは [Cloud Native Computing Foundation](https://cncf.io/) sandbox project です。**
+
+<img src="https://www.cncf.io/wp-content/uploads/2022/07/cncf-color-bg.svg" width=300 />
+
+The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/trademark-usage/).

README.md

@@ -53,9 +53,9 @@ GUI:
 
 ### Communication channels
 - [GitHub Discussions](https://github.com/lima-vm/lima/discussions)
-- `#lima` channel, colocated with `#rancher-desktop` channel in Rancher Users Slack (Lima is not a Rancher project)
-  - New account: https://slack.rancher.io/
-  - Login: https://rancher-users.slack.com/
+- `#lima` channel in the CNCF Slack
+  - New account: https://slack.cncf.io/
+  - Login: https://cloud-native.slack.com/
 
 ### Code of Conduct
 Lima follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
@@ -342,7 +342,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

cmd/apptainer.lima

@@ -0,0 +1,10 @@
+#!/bin/sh
+set -eu
+: "${LIMA_INSTANCE:=apptainer}"
+
+if [ "$(limactl ls -q "$LIMA_INSTANCE" 2>/dev/null)" != "$LIMA_INSTANCE" ]; then
+  echo "instance \"$LIMA_INSTANCE\" does not exist, run \`limactl start --name=$LIMA_INSTANCE template://apptainer\` to create a new instance" >&2
+  exit 1
+fi
+export LIMA_INSTANCE
+exec lima APPTAINER_HOME="$HOME" apptainer "$@"

cmd/lima-guestagent/install_systemd_linux.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lima-vm/lima/pkg/templateutil"
+	"github.com/lima-vm/lima/pkg/textutil"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -68,5 +68,5 @@ func generateSystemdUnit() ([]byte, error) {
 	m := map[string]string{
 		"Binary": selfExeAbs,
 	}
-	return templateutil.Execute(systemdUnitTemplate, m)
+	return textutil.ExecuteTemplate(systemdUnitTemplate, m)
 }

cmd/limactl/edit.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/lima-vm/lima/pkg/editutil"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	networks "github.com/lima-vm/lima/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/pkg/start"
@@ -55,8 +56,8 @@ func editAction(cmd *cobra.Command, args []string) error {
 	hdr := fmt.Sprintf("# Please edit the following configuration for Lima instance %q\n", instName)
 	hdr += "# and an empty file will abort the edit.\n"
 	hdr += "\n"
-	hdr += generateEditorWarningHeader()
-	yBytes, err := openEditor(instName, yContent, hdr)
+	hdr += editutil.GenerateEditorWarningHeader()
+	yBytes, err := editutil.OpenEditor(instName, yContent, hdr)
 	if err != nil {
 		return err
 	}

cmd/limactl/guessarg/guessarg.go

@@ -0,0 +1,64 @@
+package guessarg
+
+import (
+	"fmt"
+	"net/url"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/containerd/containerd/identifiers"
+)
+
+func SeemsTemplateURL(arg string) (bool, *url.URL) {
+	u, err := url.Parse(arg)
+	if err != nil {
+		return false, u
+	}
+	return u.Scheme == "template", u
+}
+
+func SeemsHTTPURL(arg string) bool {
+	u, err := url.Parse(arg)
+	if err != nil {
+		return false
+	}
+	if u.Scheme != "http" && u.Scheme != "https" {
+		return false
+	}
+	return true
+}
+
+func SeemsFileURL(arg string) bool {
+	u, err := url.Parse(arg)
+	if err != nil {
+		return false
+	}
+	return u.Scheme == "file"
+}
+
+func SeemsYAMLPath(arg string) bool {
+	if strings.Contains(arg, "/") {
+		return true
+	}
+	lower := strings.ToLower(arg)
+	return strings.HasSuffix(lower, ".yml") || strings.HasSuffix(lower, ".yaml")
+}
+
+func InstNameFromURL(urlStr string) (string, error) {
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		return "", err
+	}
+	return InstNameFromYAMLPath(path.Base(u.Path))
+}
+
+func InstNameFromYAMLPath(yamlPath string) (string, error) {
+	s := strings.ToLower(filepath.Base(yamlPath))
+	s = strings.TrimSuffix(strings.TrimSuffix(s, ".yml"), ".yaml")
+	s = strings.ReplaceAll(s, ".", "-")
+	if err := identifiers.Validate(s); err != nil {
+		return "", fmt.Errorf("filename %q is invalid: %w", yamlPath, err)
+	}
+	return s, nil
+}

cmd/limactl/info.go

@@ -4,9 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/lima-vm/lima/pkg/limayaml"
-	"github.com/lima-vm/lima/pkg/store/dirnames"
-	"github.com/lima-vm/lima/pkg/version"
+	"github.com/lima-vm/lima/pkg/infoutil"
 	"github.com/spf13/cobra"
 )
 
@@ -20,37 +18,8 @@ func newInfoCommand() *cobra.Command {
 	return infoCommand
 }
 
-type TemplateYAML struct {
-	Name     string `json:"name"`
-	Location string `json:"location"`
-}
-
-type Info struct {
-	Version         string             `json:"version"`
-	Templates       []TemplateYAML     `json:"templates"`
-	DefaultTemplate *limayaml.LimaYAML `json:"defaultTemplate"`
-	LimaHome        string             `json:"limaHome"`
-	// TODO: add diagnostic info of QEMU
-}
-
 func infoAction(cmd *cobra.Command, args []string) error {
-	b, err := readDefaultTemplate()
-	if err != nil {
-		return err
-	}
-	y, err := limayaml.Load(b, "")
-	if err != nil {
-		return err
-	}
-	info := &Info{
-		Version:         version.Version,
-		DefaultTemplate: y,
-	}
-	info.Templates, err = listTemplateYAMLs()
-	if err != nil {
-		return err
-	}
-	info.LimaHome, err = dirnames.LimaDir()
+	info, err := infoutil.GetInfo()
 	if err != nil {
 		return err
 	}