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

Merge pull request #4116 from marcosdiez/decrease_startup_time_10_seconds 

Assert that docker has started rather than explicitly restarting it
pull/3646/head
Thomas Strömberg 2019-04-25 10:55:18 -07:00 committed by GitHub
parent 829dd3ecf2 39d7dafb78
commit e9dd14939b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/minikube/cruntime/cruntime_test.go
View File

@ -381,7 +381,7 @@ func TestEnable(t *testing.T) {
want map[string]serviceState want map[string]serviceState
}{ }{
{"docker", map[string]serviceState{ {"docker", map[string]serviceState{
"docker": Restarted, "docker": Running,
"docker.socket": Running, "docker.socket": Running,
"containerd": Exited, "containerd": Exited,
"crio": Exited, "crio": Exited,

2
pkg/minikube/cruntime/docker.go
View File

@ -73,7 +73,7 @@ func (r *Docker) Enable() error {
if err := disableOthers(r, r.Runner); err != nil { if err := disableOthers(r, r.Runner); err != nil {
glog.Warningf("disableOthers: %v", err) glog.Warningf("disableOthers: %v", err)
} }
return r.Runner.Run("sudo systemctl restart docker") return r.Runner.Run("sudo systemctl start docker")
} }
// Disable idempotently disables Docker on a host // Disable idempotently disables Docker on a host