fix: trim docker.io to prevent always writing to daemon

Signed-off-by: Yue Yang <[email protected]>

Author: g1eny0ung

Diff for: pkg/minikube/cruntime/docker.go

@@ -604,15 +604,15 @@ func dockerImagesPreloaded(runner command.Runner, images []string) bool {
 	}
 	preloadedImages := map[string]struct{}{}
 	for _, i := range strings.Split(rr.Stdout.String(), "\n") {
-		i = trimDockerIO(i)
+		i = TrimDockerIO(i)
 		preloadedImages[i] = struct{}{}
 	}
 
 	klog.Infof("Got preloaded images: %s", rr.Output())
 
 	// Make sure images == imgs
 	for _, i := range images {
-		i = trimDockerIO(i)
+		i = TrimDockerIO(i)
 		if _, ok := preloadedImages[i]; !ok {
 			klog.Infof("%s wasn't preloaded", i)
 			return false
@@ -644,13 +644,6 @@ func addDockerIO(name string) string {
 	return reg + "/" + img
 }
 
-// Remove docker.io prefix since it won't be included in images names
-// when we call 'docker images'
-func trimDockerIO(name string) string {
-	name = strings.TrimPrefix(name, "docker.io/")
-	return name
-}
-
 func dockerBoundToContainerd(runner command.Runner) bool {
 	// NOTE: assumes systemd
 	rr, err := runner.RunCmd(exec.Command("sudo", "systemctl", "cat", "docker.service"))

Diff for: pkg/minikube/download/image.go

@@ -69,13 +69,20 @@ func ImageExistsInCache(img string) bool {
 
 var checkImageExistsInCache = ImageExistsInCache
 
+// Remove docker.io prefix since it won't be included in images names
+// when we call 'docker images'
+func TrimDockerIO(name string) string {
+	name = strings.TrimPrefix(name, "docker.io/")
+	return name
+}
+
 // ImageExistsInDaemon if img exist in local docker daemon
 func ImageExistsInDaemon(img string) bool {
 	// Check if image exists locally
 	klog.Infof("Checking for %s in local docker daemon", img)
 	cmd := exec.Command("docker", "images", "--format", "{{.Repository}}:{{.Tag}}@{{.Digest}}")
 	if output, err := cmd.Output(); err == nil {
-		if strings.Contains(string(output), img) {
+		if strings.Contains(string(output), TrimDockerIO(img)) {
 			klog.Infof("Found %s in local docker daemon, skipping pull", img)
 			return true
 		}