Skip to content

Commit 476c90d

Browse files
committed
Disable and stop docker when the CRI is containerd
Previously the docker service was disabled but kept running. And if stopped, would be restarted by the docker socket. Docker can be fully disabled and stopped when using containerd. Change-Id: Ic3529106806f90dcafc24006c6c0dbc30e33766b
1 parent 6951ac4 commit 476c90d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ set -x
88
ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
99

1010
if [ "${CONTAINER_RUNTIME}" = "containerd" ] ; then
11-
$ssh_cmd systemctl disable docker
11+
$ssh_cmd systemctl disable docker.service docker.socket
12+
$ssh_cmd systemctl stop docker.service docker.socket
1213
if [ -z "${CONTAINERD_TARBALL_URL}" ] ; then
1314
CONTAINERD_TARBALL_URL="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/cri-containerd-cni-${CONTAINERD_VERSION}-linux-amd64.tar.gz"
1415
fi

0 commit comments

Comments
 (0)