Merge pull request #694 from AkihiroSuda/auto-upgrade-nerdctl

cidata: automatically upgrade existing containerd/nerdctl ; nerdctl: update to v0.17.1

Author: AkihiroSuda

pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -eux
 
 if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" != 1 ] && [ "${LIMA_CIDATA_CONTAINERD_USER}" != 1 ]; then
@@ -8,14 +8,31 @@ fi
 # This script does not work unless systemd is available
 command -v systemctl >/dev/null 2>&1 || exit 0
 
-if [ ! -x /usr/local/bin/nerdctl ]; then
+# Extract bin/nerdctl and compare whether it is newer than the current /usr/local/bin/nerdctl (if already exists).
+# Takes 4-5 seconds. (FIXME: optimize)
+tmp_extract_nerdctl="$(mktemp -d)"
+tar Cxzf "${tmp_extract_nerdctl}" "${LIMA_CIDATA_MNT}"/nerdctl-full.tgz bin/nerdctl
+
+if [ ! -f /usr/local/bin/nerdctl ] || [[ "${tmp_extract_nerdctl}"/bin/nerdctl -nt /usr/local/bin/nerdctl ]]; then
+	if [ -f /usr/local/bin/nerdctl ]; then
+		(
+			set +e
+			echo "Upgrading existing nerdctl"
+			echo "- Old: $(/usr/local/bin/nerdctl --version)"
+			echo "- New: $("${tmp_extract_nerdctl}"/bin/nerdctl --version)"
+			systemctl disable --now containerd buildkit stargz-snapshotter
+			sudo -iu "${LIMA_CIDATA_USER}" "XDG_RUNTIME_DIR=/run/user/${LIMA_CIDATA_UID}" "PATH=${PATH}" containerd-rootless-setuptool.sh uninstall
+		)
+	fi
 	tar Cxzf /usr/local "${LIMA_CIDATA_MNT}"/nerdctl-full.tgz
 
 	mkdir -p /etc/bash_completion.d
 	nerdctl completion bash >/etc/bash_completion.d/nerdctl
 	# TODO: enable zsh completion too
 fi
 
+rm -rf "${tmp_extract_nerdctl}"
+
 if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ]; then
 	mkdir -p /etc/containerd
 	cat >"/etc/containerd/config.toml" <<EOF

pkg/limayaml/defaults.go

@@ -22,20 +22,20 @@ import (
 )
 
 func defaultContainerdArchives() []File {
-	const nerdctlVersion = "0.17.0"
+	const nerdctlVersion = "0.17.1"
 	location := func(goarch string) string {
 		return "https://github.com/containerd/nerdctl/releases/download/v" + nerdctlVersion + "/nerdctl-full-" + nerdctlVersion + "-linux-" + goarch + ".tar.gz"
 	}
 	return []File{
 		{
 			Location: location("amd64"),
 			Arch:     X8664,
-			Digest:   "sha256:5eef74d5031b2f014a7f594e1f2ff319161a29f9309a56bee1a44fb90430a28d",
+			Digest:   "sha256:046ac1c3d007b9b64880cb15a78ea1e0be345d31f51ff282be783a9c203f299d",
 		},
 		{
 			Location: location("arm64"),
 			Arch:     AARCH64,
-			Digest:   "sha256:b0ae2fc89d362afa18afcc35798d4da613096613d06cae07181b777cd66002e8",
+			Digest:   "sha256:b773a0db178af9d0963b7c84df88ee434e0c1986fe7491dc1de3231e071e3921",
 		},
 	}
 }