From 2be9e903888743404bab4b83f17b4d04acc2f732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 3 Jul 2023 22:54:15 +0200 Subject: [PATCH] Add ignition nerdctl-full installer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This doesn't actually start any services, but waiting for the nerdctl user to run `containerd-rootless-setuptool.sh install`. Alternatively to start up the installed system containerd.service, replacing the one from docker, and run `sudo nerdctl` with it. Signed-off-by: Anders F Björklund --- examples/experimental/fedora-coreos.yaml | 5 ----- pkg/cidata/cidata.TEMPLATE.d/ignition.yaml | 11 +++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/examples/experimental/fedora-coreos.yaml b/examples/experimental/fedora-coreos.yaml index be1afc036a2..512c462a8da 100644 --- a/examples/experimental/fedora-coreos.yaml +++ b/examples/experimental/fedora-coreos.yaml @@ -13,8 +13,3 @@ images: mounts: - location: "/tmp/lima" writable: true - -# The built-in containerd installer does not support CoreOS currently. -containerd: - system: false - user: false diff --git a/pkg/cidata/cidata.TEMPLATE.d/ignition.yaml b/pkg/cidata/cidata.TEMPLATE.d/ignition.yaml index c30ab0b9adc..94c89732fca 100644 --- a/pkg/cidata/cidata.TEMPLATE.d/ignition.yaml +++ b/pkg/cidata/cidata.TEMPLATE.d/ignition.yaml @@ -61,6 +61,17 @@ systemd: [Install] RequiredBy=multi-user.target +{{- if or .Containerd.User .Containerd.System }} + - name: lima-install-containerd.service + enabled: true + contents: | + [Service] + Type=oneshot + ExecStart=/bin/sh -c "/usr/bin/tar Cxzf /usr/local /mnt/lima-cidata/nerdctl-full.tgz" + + [Install] + RequiredBy=multi-user.target +{{- end}} - name: lima-install-guestagent.service enabled: true contents: |