Skip to content

Commit f4a8911

Browse files
committed
cidata: fix upgrading nerdctl
`containerd-rootless-setuptool.sh uninstall` was called without uninstalling BuildKit Signed-off-by: Akihiro Suda <[email protected]>
1 parent 941ed68 commit f4a8911

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
22
set -eux
3+
: "${CONTAINERD_NAMESPACE:=default}"
4+
# Overridable in .bashrc
5+
: "${CONTAINERD_SNAPSHOTTER:=overlayfs}"
36

47
if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" != 1 ] && [ "${LIMA_CIDATA_CONTAINERD_USER}" != 1 ]; then
58
exit 0
@@ -20,7 +23,8 @@ if [ ! -f "${LIMA_CIDATA_GUEST_INSTALL_PREFIX}"/bin/nerdctl ] || [[ "${tmp_extra
2023
echo "Upgrading existing nerdctl"
2124
echo "- Old: $("${LIMA_CIDATA_GUEST_INSTALL_PREFIX}"/bin/nerdctl --version)"
2225
echo "- New: $("${tmp_extract_nerdctl}"/bin/nerdctl --version)"
23-
systemctl disable --now containerd buildkit stargz-snapshotter
26+
systemctl disable --now containerd default-buildkit stargz-snapshotter
27+
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
2428
sudo -iu "${LIMA_CIDATA_USER}" "XDG_RUNTIME_DIR=/run/user/${LIMA_CIDATA_UID}" "PATH=${PATH}" containerd-rootless-setuptool.sh uninstall
2529
)
2630
fi
@@ -33,10 +37,6 @@ fi
3337

3438
rm -rf "${tmp_extract_nerdctl}"
3539

36-
: "${CONTAINERD_NAMESPACE:=default}"
37-
# Overridable in .bashrc
38-
: "${CONTAINERD_SNAPSHOTTER:=overlayfs}"
39-
4040
if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ]; then
4141
mkdir -p /etc/containerd /etc/buildkit
4242
cat >"/etc/containerd/config.toml" <<EOF

0 commit comments

Comments
 (0)