From aa15485105a58c0e169bcab109f78dc8c7a39059 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 2 Feb 2024 21:41:32 +0900 Subject: [PATCH] cidata: fix upgrading nerdctl `containerd-rootless-setuptool.sh uninstall` was called without uninstalling BuildKit Signed-off-by: Akihiro Suda --- .../cidata.TEMPLATE.d/boot/40-install-containerd.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh b/pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh index 1f5f004c5ae..b2c6ad6ab0a 100644 --- a/pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh +++ b/pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh @@ -1,5 +1,8 @@ #!/bin/bash set -eux +: "${CONTAINERD_NAMESPACE:=default}" +# Overridable in .bashrc +: "${CONTAINERD_SNAPSHOTTER:=overlayfs}" if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" != 1 ] && [ "${LIMA_CIDATA_CONTAINERD_USER}" != 1 ]; then exit 0 @@ -20,7 +23,8 @@ if [ ! -f "${LIMA_CIDATA_GUEST_INSTALL_PREFIX}"/bin/nerdctl ] || [[ "${tmp_extra echo "Upgrading existing nerdctl" echo "- Old: $("${LIMA_CIDATA_GUEST_INSTALL_PREFIX}"/bin/nerdctl --version)" echo "- New: $("${tmp_extract_nerdctl}"/bin/nerdctl --version)" - systemctl disable --now containerd buildkit stargz-snapshotter + systemctl disable --now containerd default-buildkit stargz-snapshotter + sudo -iu "${LIMA_CIDATA_USER}" "XDG_RUNTIME_DIR=/run/user/${LIMA_CIDATA_UID}" "PATH=${PATH}" "CONTAINERD_NAMESPACE=${CONTAINERD_NAMESPACE}" containerd-rootless-setuptool.sh uninstall-buildkit-containerd sudo -iu "${LIMA_CIDATA_USER}" "XDG_RUNTIME_DIR=/run/user/${LIMA_CIDATA_UID}" "PATH=${PATH}" containerd-rootless-setuptool.sh uninstall ) fi @@ -33,10 +37,6 @@ fi rm -rf "${tmp_extract_nerdctl}" -: "${CONTAINERD_NAMESPACE:=default}" -# Overridable in .bashrc -: "${CONTAINERD_SNAPSHOTTER:=overlayfs}" - if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ]; then mkdir -p /etc/containerd /etc/buildkit cat >"/etc/containerd/config.toml" <