Merge pull request #42 from jandubois/bump-nerdctl-2.0.0

Bump nerdctl 2.0.0

Makefile

@@ -24,7 +24,7 @@ ARCH_ALIAS = $(shell echo "$(ARCH_ALIAS_$(ARCH))")
 BINFMT_IMAGE=tonistiigi/binfmt:qemu-$(QEMU_VERSION)
 CRI_DOCKERD_ORG=Mirantis
 CRI_DOCKERD_VERSION=0.3.15
-NERDCTL_VERSION=2.0.0-rc.3
+NERDCTL_VERSION=2.0.0
 OPENRESTY_VERSION=0.0.5
 QEMU_VERSION=v8.1.5
 

lima-init.sh

@@ -30,8 +30,9 @@ if [ -n "${LIMA_CIDATA_TIMEZONE}" ]; then
 fi
 
 # Create user
-LIMA_CIDATA_HOMEDIR="/home/${LIMA_CIDATA_USER}.linux"
-useradd --home-dir "${LIMA_CIDATA_HOMEDIR}" --create-home --uid "${LIMA_CIDATA_UID}" "${LIMA_CIDATA_USER}"
+# LIMA_CIDATA_HOME has been added in Lima 0.18.0
+LIMA_CIDATA_HOMEDIR=${LIMA_CIDATA_HOME:-/home/${LIMA_CIDATA_USER}.linux}
+useradd --home-dir "${LIMA_CIDATA_HOMEDIR}" --create-home --comment "${LIMA_CIDATA_COMMENT:-}" --uid "${LIMA_CIDATA_UID}" "${LIMA_CIDATA_USER}"
 
 # Add user to sudoers
 echo "${LIMA_CIDATA_USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/90-lima-users

mkimg.lima.sh

@@ -13,7 +13,7 @@ profile_lima() {
 	kernel_cmdline="console=hvc0 console=tty0 console=ttyS0,115200"
 	syslinux_serial="0 115200"
 	apkovl="genapkovl-lima.sh"
-	apks="$apks openssh-server-pam"
+	apks="$apks openssh-server-pam tiny-cloud-nocloud"
         if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
             apks="$apks ca-certificates"
         fi