Skip to content

Commit

Permalink
cidata: fix upgrading nerdctl
Browse files Browse the repository at this point in the history
`containerd-rootless-setuptool.sh uninstall` was called without
uninstalling BuildKit

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed Jun 26, 2024
1 parent d58e833 commit aa15485
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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" <<EOF
Expand Down

0 comments on commit aa15485

Please sign in to comment.