kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use daemon info so this works for docker and podman

pull/8831/head
Priya Wadhwa 2020-08-24 17:50:09 -04:00
parent 535294e523
commit d634a85ff9
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/minikube/cmd/start.go
View File

@ -1223,20 +1223,19 @@ func validateDockerStorageDriver(drvName string) {
if !driver.IsKIC(drvName) {
return
}
if _, err := exec.LookPath("docker"); err != nil {
exit.WithCodeT(exit.BadUsage, "Please make sure docker is available on your PATH")
if _, err := exec.LookPath(drvName); err != nil {
exit.WithCodeT(exit.BadUsage, "Please make sure {{.DriverName}} is available on your PATH", out.V{"DriverName": drvName})
}
j, err := exec.Command("docker", "info", "--format", "{{.Driver}}").Output()
si, err := oci.DaemonInfo(drvName)
if err != nil {
glog.Warningf("Unable to confirm that docker is using overlay2; setting preload=false")
glog.Warningf("Unable to confirm that %s is using overlay2 storage driver; setting preload=false", drvName)
viper.Set(preload, false)
return
}
driver := strings.Trim(string(j), "\n")
if driver == "overlay2" {
if si.StorageDriver == "overlay2" {
return
}
out.WarningT("Docker is currently using the {{.Driver}} storage driver. Consider switching to overlay2 for better performance.", out.V{"Driver": driver})
out.WarningT("{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance", out.V{"StorageDriver": si.StorageDriver, "Driver": drvName})
viper.Set(preload, false)
}

2
pkg/drivers/kic/oci/oci.go
View File

@ -205,8 +205,6 @@ func CreateContainerNode(p CreateParams) error {
runArgs = append(runArgs, "--userns=host")
}
fmt.Println(runArgs)
if err := createContainer(p.OCIBinary, p.Image, withRunArgs(runArgs...), withMounts(p.Mounts), withPortMappings(p.PortMappings)); err != nil {
return errors.Wrap(err, "create container")
}