Merge pull request #4116 from marcosdiez/decrease_startup_time_10_seconds
Assert that docker has started rather than explicitly restarting itpull/3646/head
commit
e9dd14939b
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue