Skip to content

Commit 40d3179

Browse files
Merge pull request #274 from step-security/rcbranch
Reload docker daemon instead of restarting
2 parents f3f8ee7 + fd86e39 commit 40d3179

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

dnsconfig.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ func (d *DnsConfig) SetDockerDNSServer(cmd Command, configPath, tempDir string)
169169
}
170170

171171
if cmd == nil {
172-
cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl restart docker")
172+
cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl reload docker")
173173
}
174174

175175
err = cmd.Run()
176176
if err != nil {
177-
return fmt.Errorf(fmt.Sprintf("error re-starting docker: %v", err))
177+
return fmt.Errorf(fmt.Sprintf("error reloading docker: %v", err))
178178
}
179179

180180
return nil
@@ -189,12 +189,12 @@ func (d *DnsConfig) RevertDockerDNSServer(cmd Command, configPath string) error
189189
}
190190

191191
if cmd == nil {
192-
cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl restart docker")
192+
cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl reload docker")
193193
}
194194

195195
err = cmd.Run()
196196
if err != nil {
197-
return fmt.Errorf(fmt.Sprintf("error re-starting docker: %v", err))
197+
return fmt.Errorf(fmt.Sprintf("error reloading docker: %v", err))
198198
}
199199
}
200200
return nil

0 commit comments

Comments
 (0)