fix build

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI in Docker (fast, no full system-access)
 on:
   push:
     paths-ignore:
-      - '**.md'
-      - '.github/workflows/ci-vm.yml'
-      - 'vm-resources/**'
+      - "**.md"
+      - ".github/workflows/ci-vm.yml"
+      - "vm-resources/**"
   workflow_dispatch:
 
 jobs:

.github/workflows/update.yml

@@ -3,12 +3,12 @@ on:
   workflow_dispatch:
   schedule:
     # At 07:00 UTC on Sunday
-    - cron: '0 7 * * 0'
+    - cron: "0 7 * * 0"
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - run: python3 update-forks.py
         env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          GITHUB_TOKEN: ${{ secrets.PAT }}

.gitignore

@@ -1,5 +1 @@
-.vagrant
-code
-package.box
-containers-lab*.box
 __pycache__

Makefile

@@ -0,0 +1,20 @@
+build:
+	cat container-lab.yaml | limactl create --name=container-lab-vm -
+
+start:
+	limactl start container-lab-vm
+
+shell:
+	limactl shell container-lab-vm
+
+stop:
+	limactl stop container-lab-vm
+
+delete:
+	limactl delete container-lab-vm
+
+playbook:
+	ansible-playbook -v --inventory "localhost," --connection=local playbook.yaml
+	cp vm-resources/container-socket.service /etc/systemd/system/container-socket.service
+	systemctl enable container-socket.service
+	systemctl start container-socket.service

README.md

@@ -51,10 +51,27 @@ Layering, Builder Pattern, Multi-Arch builds
 
 ## Playground Environment
 
-[`Vagrantfile`](./Vagrantfile) provides a reproducible development environment built via [an Ansible playbook](./playbook.yaml).
+[`container-lab.yaml`](./container-lab.yaml) provides a reproducible development environment built via [an Ansible playbook](./playbook.yaml).
 
 So far there is not much to see there, but the vision is to produce an environment with all needs to tinker with container software, to change it and to learn about it.
 
+It's built using [lima](https://github.com/lima-vm/lima/).
+The `Makefile` has some shortcuts for using it.
+
+This can be used with the [ssh remote plugin for vs code](https://code.visualstudio.com/docs/remote/ssh) to work with the repos inside the vm.
+
+Configuration for vs code ssh remote plugin:
+
+You need a local ssh key for this.
+
+Run the following command to allow easy access:
+
+```
+echo "Include ${LIMA_HOME:-$HOME/.lima}/container-lab-vm/ssh.config" >> ~/.ssh/config
+```
+
+After this you can connect to the host `lima-container-lab-vm`.
+
 ## Talks
 
 [Containers at Facebook - Lindsay Salisbury](https://youtu.be/_Qc9jBk18w8)

container-lab.yaml

@@ -0,0 +1,40 @@
+# SPDX-FileCopyrightText: Florian Wilhelm
+# SPDX-License-Identifier: Apache-2.0
+
+# Based on the examples by Akihiro Suda and the lima contributors, see https://github.com/lima-vm/lima, distributed under Apache-2.0 license
+
+images:
+- location: "https://cloud.debian.org/images/cloud/trixie/daily/latest/debian-13-genericcloud-amd64-daily.qcow2"
+  arch: "x86_64"
+- location: "https://cloud.debian.org/images/cloud/trixie/daily/latest/debian-13-genericcloud-arm64-daily.qcow2"
+  arch: "aarch64"
+
+mounts:
+- location: "~"
+- location: "/tmp/lima"
+  writable: true
+
+provision:
+- mode: system
+  script: |
+    #!/bin/bash
+    set -eux -o pipefail
+    export DEBIAN_FRONTEND=noninteractive
+    apt-get update
+    apt-get -y install git jq python3-pip python-is-python3 ansible python3-pytest
+
+- mode: user
+  script: |
+    #!/bin/bash
+    set -eux -o pipefail
+
+    curl https://raw.githubusercontent.com/fwilhe2/lima-vms/main/provision.sh | bash
+    mkdir -p code; cd code
+
+ssh:
+  localPort: 44444
+  loadDotSSHPubKeys: true
+
+containerd:
+  system: false
+  user: false

git-repos.txt

@@ -8,9 +8,11 @@ https://github.com/fwilhe-containers/crun
 https://github.com/fwilhe-containers/ctop
 https://github.com/fwilhe-containers/gvisor
 https://github.com/fwilhe-containers/ignite
+https://github.com/fwilhe-containers/incus
 https://github.com/fwilhe-containers/nodejs-container-image-builder
 https://github.com/fwilhe-containers/plugins
 https://github.com/fwilhe-containers/podman
+https://github.com/fwilhe-containers/Quark
 https://github.com/fwilhe-containers/rootlesskit
 https://github.com/fwilhe-containers/runc
 https://github.com/fwilhe-containers/skopeo