Check if Docker installed via Snap Package Manager

pkg/minikube/command/kic_runner.go

@@ -24,7 +24,6 @@ import (
 	"os"
 	"os/exec"
 	"path"
-	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
@@ -35,6 +34,7 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/assets"
+	"k8s.io/minikube/pkg/minikube/detect"
 )
 
 // kicRunner runs commands inside a container
@@ -187,8 +187,7 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error {
 	}
 	klog.Infof("%s (temp): %s --> %s (%d bytes)", k.ociBin, src, dst, f.GetLength())
 
-	isSnap := isSnapBinary()
-	tmpFolder, err := tempDirectory(isSnap)
+	tmpFolder, err := tempDirectory(detect.MinikubeInstalledViaSnap(), detect.DockerInstalledViaSnap())
 	if err != nil {
 		return errors.Wrap(err, "determining temp directory")
 	}
@@ -207,8 +206,8 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error {
 
 // tempDirectory returns the directory to use as the temp directory
 // or an empty string if it should use the os default temp directory.
-func tempDirectory(isSnap bool) (string, error) {
-	if !isSnap {
+func tempDirectory(isMinikubeSnap bool, isDockerSnap bool) (string, error) {
+	if !isMinikubeSnap && !isDockerSnap {
 		return "", nil
 	}
 
@@ -222,16 +221,6 @@ func tempDirectory(isSnap bool) (string, error) {
 	return home, nil
 }
 
-// isSnapBinary returns true if the binary path includes "snap".
-func isSnapBinary() bool {
-	ex, err := os.Executable()
-	if err != nil {
-		return false
-	}
-	exPath := filepath.Dir(ex)
-	return strings.Contains(exPath, "snap")
-}
-
 func (k *kicRunner) copy(src string, dst string) error {
 	fullDest := fmt.Sprintf("%s:%s", k.nameOrID, dst)
 	if k.ociBin == oci.Podman {

pkg/minikube/command/kic_runner_test.go

@@ -33,21 +33,24 @@ func TestKICRunner(t *testing.T) {
 		}
 
 		tests := []struct {
-			in   bool
-			want string
+			isMinikubeSnap bool
+			isDockerSnap   bool
+			want           string
 		}{
-			{false, ""},
-			{true, home},
+			{false, false, ""},
+			{true, true, home},
+			{false, true, home},
+			{true, false, home},
 		}
 
 		for _, tt := range tests {
-			got, err := tempDirectory(tt.in)
+			got, err := tempDirectory(tt.isMinikubeSnap, tt.isDockerSnap)
 			if err != nil {
 				t.Fatalf("failed to get temp directory: %v", err)
 			}
 
 			if got != tt.want {
-				t.Errorf("tempDirectory(%t) = %s; want %s", tt.in, got, tt.want)
+				t.Errorf("tempDirectory(%t, %t) = %s; want %s", tt.isMinikubeSnap, tt.isDockerSnap, got, tt.want)
 			}
 		}
 	})

pkg/minikube/detect/detect.go

@@ -19,6 +19,8 @@ package detect
 import (
 	"net/http"
 	"os"
+	"os/exec"
+	"path/filepath"
 	"runtime"
 	"strings"
 
@@ -52,3 +54,25 @@ func IsCloudShell() bool {
 func IsAmd64M1Emulation() bool {
 	return runtime.GOARCH == "amd64" && strings.HasPrefix(cpuid.CPU.BrandName, "VirtualApple")
 }
+
+// MinikubeInstalledViaSnap returns true if the minikube binary path includes "snap".
+func MinikubeInstalledViaSnap() bool {
+	ex, err := os.Executable()
+	if err != nil {
+		return false
+	}
+	exPath := filepath.Dir(ex)
+
+	return strings.Contains(exPath, "snap")
+}
+
+// DockerInstalledViaSnap returns true if the Docker binary path includes "snap".
+func DockerInstalledViaSnap() bool {
+	c := exec.Command("which", "docker")
+	o, err := c.Output()
+	if err != nil {
+		return false
+	}
+
+	return strings.Contains(string(o), "snap")
+}