From cecef71f5135da8dc7adb1dbb41ca65207ca6da3 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 26 May 2021 12:10:17 -0700 Subject: [PATCH] disable docker service when containerd --- pkg/minikube/cruntime/cruntime.go | 6 +++--- pkg/minikube/cruntime/docker.go | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/cruntime/cruntime.go b/pkg/minikube/cruntime/cruntime.go index d0bff65f06..44c5dbc6a3 100644 --- a/pkg/minikube/cruntime/cruntime.go +++ b/pkg/minikube/cruntime/cruntime.go @@ -225,9 +225,9 @@ func disableOthers(me Manager, cr CommandRunner) error { klog.Infof("skipping containerd shutdown because we are bound to it") continue } - - // runtime is already disabled, nothing to do. - if !r.Active() { + // in case of docker, if other runtime are already not active we are sure it is disabled, nothing to do. + // because #11515 in base image we have other runtimes disabled by default. + if me.Name() == "Docker" && !r.Active() { continue } diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 531d3da300..596995f546 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -150,6 +150,7 @@ func (r *Docker) Restart() error { // Disable idempotently disables Docker on a host func (r *Docker) Disable() error { + klog.Info("disabling docker service") // because #10373 if err := r.Init.ForceStop("docker.socket"); err != nil { klog.ErrorS(err, "Failed to stop", "service", "docker.socket")