Container api port watcher

.github/dependabot.yml

@@ -1,7 +1,9 @@
 version: 2
 updates:
 - package-ecosystem: gomod
-  directory: "/"
+  directories:
+  - "/"
+  - "/hack/tools"
   schedule:
     interval: daily
   open-pull-requests-limit: 10

.github/workflows/codeql.yaml

@@ -32,7 +32,7 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2
+      uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d  # v3.29.5
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -48,6 +48,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2
+      uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d  # v3.29.5
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -60,6 +60,6 @@ jobs:
     # Upload the results to GitHub's code scanning dashboard (optional).
     # Commenting out will disable upload of results to your repo's Code Scanning dashboard
     - name: "Upload to code-scanning"
-      uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2
+      uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d  # v3.29.5
       with:
         sarif_file: results.sarif

.github/workflows/test.yml

@@ -33,12 +33,13 @@ jobs:
     - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5  # v5.5.0
       with:
         go-version: 1.24.x
-    - name: Install protoc
+    - name: Install protoc and Go plugins
       run: |
         sudo apt-get update
         sudo apt-get install -y protobuf-compiler
+        make install-protoc-tools
     - name: Verify generated files
-      run: make install-tools generate check-generated
+      run: make generate check-generated
     - name: Run yamllint
       run: yamllint .
     - name: Install shellcheck
@@ -49,23 +50,22 @@ jobs:
       uses: ls-lint/action@02e380fe8733d499cbfc9e22276de5085508a5bd  # v2.3.1
     - name: Run shellcheck
       run: find . -name '*.sh' | xargs shellcheck
-    - name: Install shfmt
-      run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.4.3
     - name: Run shfmt
-      run: find . -name '*.sh' | xargs shfmt -s -d
+      run: find . -name '*.sh' | xargs go tool -modfile=./hack/tools/go.mod shfmt -s -d
     - name: Check hyperlinks
       uses: docker://dkhamsing/awesome_bot:latest@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884
       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,https://xbarapp.com,https://api.github.com
     - name: Install go-licenses
+      # TODO: move to `go tool` after upgrading to v2
       run: go install github.com/google/go-licenses@v1.6.0
     - name: Check licenses
       # the allow list corresponds to https://github.com/cncf/foundation/blob/e5db022a0009f4db52b89d9875640cf3137153fe/allowed-third-party-license-policy.md
       run: go-licenses check --include_tests  ./... --allowed_licenses=$(cat ./hack/allowed-licenses.txt)
-    - name: Install ltag
-      run: go install github.com/containerd/ltag@v0.3.0
     - name: Check license boilerplates
-      run: ltag -t ./hack/ltag --check -v
+      run: go tool -modfile=./hack/tools/go.mod ltag -t ./hack/ltag --check -v
+    - name: Check protobuf files
+      run: go tool -modfile=./hack/tools/go.mod protolint .
 
   lint-go:
     name: "Lint Go"
@@ -88,10 +88,15 @@ jobs:
     - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5  # v5.5.0
       with:
         go-version: 1.24.x
+    - id: golangci-lint-version
+      shell: bash
+      working-directory: hack/tools
+      run: |
+        echo "GOLANGCI_LINT_VERSION=$(go list -m -f '{{.Version}}' github.com/golangci/golangci-lint/v2)" >> $GITHUB_OUTPUT
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9  # v8.0.0
       with:
-        version: v2.2
+        version: ${{ steps.golangci-lint-version.outputs.GOLANGCI_LINT_VERSION }}
         args: --verbose
 
   security:

.golangci.yml

@@ -90,7 +90,7 @@ linters:
       - name: dot-imports
         arguments:
         - allowedPackages:
-          - github.com/lima-vm/lima/pkg/must
+          - github.com/lima-vm/lima/v2/pkg/must
       - name: empty-block
       - name: error-naming
       - name: error-return

.protolint.yaml

@@ -0,0 +1,11 @@
+# This is the configuration for protolint.
+# See https://github.com/yoheimuta/protolint/blob/v0.55.6/_example/config/.protolint.yaml for details.
+---
+lint:
+  rules:
+    # Enable all default rules.
+    no_default: false
+  rules_option:
+    # MAX_LINE_LENGTH rule option.
+    max_line_length:
+      max_chars: 100

Makefile

@@ -9,11 +9,6 @@ TAR ?= tar
 ZIP ?= zip
 PLANTUML ?= plantuml # may also be "java -jar plantuml.jar" if installed elsewhere
 
-# The KCONFIG programs are only needed for re-generating the ".config" file.
-# You can install the python "kconfiglib", if you don't have kconfig/kbuild.
-KCONFIG_CONF ?= $(shell command -v kconfig-conf || command -v kbuild-conf || echo oldconfig)
-KCONFIG_MCONF ?= $(shell command -v kconfig-mconf || command -v kbuild-mconf || echo menuconfig)
-
 GOARCH ?= $(shell $(GO) env GOARCH)
 GOHOSTARCH := $(shell $(GO) env GOHOSTARCH)
 GOHOSTOS := $(shell $(GO) env GOHOSTOS)
@@ -43,7 +38,7 @@ endif
 endif
 endif
 
-PACKAGE := github.com/lima-vm/lima
+PACKAGE := github.com/lima-vm/lima/v2
 
 VERSION := $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags)
 VERSION_TRIMMED := $(VERSION:v%=%)
@@ -95,7 +90,7 @@ help-targets:
 	@echo  '- helpers                   : Copy nerdctl.lima, apptainer.lima, docker.lima, podman.lima, and kubectl.lima'
 	@echo
 	@echo  'Targets for files in _output/share/lima/:'
-	@echo  '- guestagents               : Build guestagents for archs enabled by CONFIG_GUESTAGENT_ARCH_*'
+	@echo  '- guestagents               : Build guestagents'
 	@echo  '- native-guestagent         : Build guestagent for native arch'
 	@echo  '- additional-guestagents    : Build guestagents for archs other than native arch'
 	@echo  '- <arch>-guestagent         : Build guestagent for <arch>: $(sort $(LINUX_GUESTAGENT_ARCHS))'
@@ -143,22 +138,15 @@ minimal: clean limactl native-guestagent default_template
 native: clean limactl helpers native-guestagent templates template_experimentals
 
 ################################################################################
-# Kconfig
-config: Kconfig
-	$(warning Kconfig is deprecated since Lima v1.2 and will be removed in Lima v2.0.)
-	$(KCONFIG_CONF) $<
-
-menuconfig: Kconfig
-	$(warning Kconfig is deprecated since Lima v1.2 and will be removed in Lima v2.0.)
-	MENUCONFIG_STYLE=aquatic \
-	$(KCONFIG_MCONF) $<
-
-# Copy the default config, if not overridden locally
-# This is done to avoid a dependency on KCONFIG tools
-.config: config.mk
-	cp $^ $@
-
--include .config
+# These configs were once customizable but should no longer be changed.
+CONFIG_GUESTAGENT_OS_LINUX=y
+CONFIG_GUESTAGENT_ARCH_X8664=y
+CONFIG_GUESTAGENT_ARCH_AARCH64=y
+CONFIG_GUESTAGENT_ARCH_ARMV7L=y
+CONFIG_GUESTAGENT_ARCH_PPC64LE=y
+CONFIG_GUESTAGENT_ARCH_RISCV64=y
+CONFIG_GUESTAGENT_ARCH_S390X=y
+CONFIG_GUESTAGENT_COMPRESS=y
 
 ################################################################################
 .PHONY: binaries
@@ -243,18 +231,48 @@ endif
 # calls the native resolver library and not the simplistic version in the Go library.
 ENVS__output/bin/limactl$(exe) = CGO_ENABLED=1 GOOS="$(GOOS)" GOARCH="$(GOARCH)" CC="$(CC)"
 
+LIMACTL_DRIVER_TAGS :=
+ifneq (,$(findstring vz,$(ADDITIONAL_DRIVERS)))
+LIMACTL_DRIVER_TAGS += external_vz
+endif
+ifneq (,$(findstring qemu,$(ADDITIONAL_DRIVERS)))
+LIMACTL_DRIVER_TAGS += external_qemu
+endif
+ifneq (,$(findstring wsl2,$(ADDITIONAL_DRIVERS)))
+LIMACTL_DRIVER_TAGS += external_wsl2
+endif
+
+GO_BUILDTAGS ?=
+GO_BUILDTAGS_LIMACTL := $(strip $(GO_BUILDTAGS) $(LIMACTL_DRIVER_TAGS))
+
 _output/bin/limactl$(exe): $(LIMACTL_DEPS) $$(call force_build,$$@)
-# If the previous cross-compilation was for GOOS=windows, limactl.exe might still be present.
 ifneq ($(GOOS),windows) #
 	@rm -rf _output/bin/limactl.exe
 else
 	@rm -rf _output/bin/limactl
 endif
-	$(ENVS_$@) $(GO_BUILD) -o $@ ./cmd/limactl
+	$(ENVS_$@) $(GO_BUILD) -tags '$(GO_BUILDTAGS_LIMACTL)' -o $@ ./cmd/limactl
 ifeq ($(GOOS),darwin)
 	codesign -f -v --entitlements vz.entitlements -s - $@
 endif
 
+DRIVER_INSTALL_DIR := _output/libexec/lima
+
+.PHONY: additional-drivers
+additional-drivers:
+	@mkdir -p $(DRIVER_INSTALL_DIR)
+	@for drv in $(ADDITIONAL_DRIVERS); do \
+		echo "Building $$drv as external"; \
+		if [ "$(GOOS)" = "windows" ]; then \
+			$(GO_BUILD) -o $(DRIVER_INSTALL_DIR)/lima-driver-$$drv.exe ./cmd/lima-driver-$$drv; \
+		else \
+			$(GO_BUILD) -o $(DRIVER_INSTALL_DIR)/lima-driver-$$drv ./cmd/lima-driver-$$drv; \
+			fi; \
+		if [ "$$drv" = "vz" ] && [ "$(GOOS)" = "darwin" ]; then \
+			codesign -f -v --entitlements vz.entitlements -s - $(DRIVER_INSTALL_DIR)/lima-driver-vz; \
+		fi; \
+	done
+
 LIMA_CMDS = $(sort lima lima$(bat)) # $(sort ...) deduplicates the list
 LIMA_DEPS = $(addprefix _output/bin/,$(LIMA_CMDS))
 lima: $(LIMA_DEPS)
@@ -496,15 +514,16 @@ lint: check-generated
 	find . -name '*.sh' ! -path "./.git/*" | xargs shfmt -s -d
 	go-licenses check --include_tests ./... --allowed_licenses=$$(cat ./hack/allowed-licenses.txt)
 	ltag -t ./hack/ltag --check -v
+	protolint .
 
 .PHONY: clean
 clean:
 	rm -rf _output vendor
 
-.PHONY: install-tools
-install-tools:
-	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
-	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
+.PHONY: install-protoc-tools
+install-protoc-tools:
+	go install -modfile=./hack/tools/go.mod google.golang.org/protobuf/cmd/protoc-gen-go
+	go install -modfile=./hack/tools/go.mod google.golang.org/grpc/cmd/protoc-gen-go-grpc
 
 .PHONY: generate
 generate:

cmd/lima-driver-qemu/main.go

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: Copyright The Lima Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"github.com/lima-vm/lima/v2/pkg/driver/external/server"
+	"github.com/lima-vm/lima/v2/pkg/driver/qemu"
+)
+
+// To be used as an external driver for Lima.
+func main() {
+	server.Serve(qemu.New())
+}

cmd/lima-driver-vz/main_darwin.go

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: Copyright The Lima Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"github.com/lima-vm/lima/v2/pkg/driver/external/server"
+	"github.com/lima-vm/lima/v2/pkg/driver/vz"
+)
+
+// To be used as an external driver for Lima.
+func main() {
+	server.Serve(vz.New())
+}

cmd/lima-driver-wsl2/main_windows.go

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: Copyright The Lima Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"github.com/lima-vm/lima/v2/pkg/driver/external/server"
+	"github.com/lima-vm/lima/v2/pkg/driver/wsl2"
+)
+
+// To be used as an external driver for Lima.
+func main() {
+	server.Serve(wsl2.New())
+}