Skip to content

Commit

Permalink
Merge pull request #4116 from marcosdiez/decrease_startup_time_10_sec…
Browse files Browse the repository at this point in the history
…onds

Assert that docker has started rather than explicitly restarting it
  • Loading branch information
tstromberg authored Apr 25, 2019
2 parents 829dd3e + 39d7daf commit e9dd149
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/minikube/cruntime/cruntime_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ func TestEnable(t *testing.T) {
want map[string]serviceState
}{
{"docker", map[string]serviceState{
"docker": Restarted,
"docker": Running,
"docker.socket": Running,
"containerd": Exited,
"crio": Exited,
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/cruntime/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (r *Docker) Enable() error {
if err := disableOthers(r, r.Runner); err != nil {
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
Expand Down

0 comments on commit e9dd149

Please sign in to comment.