Browse Source

fix: 解决 Docker 重启失败的问题 (#6805)

pull/6806/head
ssongliu 1 month ago committed by GitHub
parent
commit
cf1d02771f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      backend/app/service/docker.go
  2. 2
      backend/utils/cmd/cmd.go

3
backend/app/service/docker.go

@ -426,6 +426,9 @@ func changeLogOption(daemonMap map[string]interface{}, logMaxFile, logMaxSize st
} }
func validateDockerConfig() error { func validateDockerConfig() error {
if !cmd.Which("dockerd") {
return nil
}
stdout, err := cmd.Exec("dockerd --validate") stdout, err := cmd.Exec("dockerd --validate")
if err != nil || (stdout != "" && strings.TrimSpace(stdout) != "configuration OK") { if err != nil || (stdout != "" && strings.TrimSpace(stdout) != "configuration OK") {
return fmt.Errorf("Docker configuration validation failed, err: %v", stdout) return fmt.Errorf("Docker configuration validation failed, err: %v", stdout)

2
backend/utils/cmd/cmd.go

@ -204,7 +204,7 @@ func SudoHandleCmd() string {
func Which(name string) bool { func Which(name string) bool {
stdout, err := Execf("which %s", name) stdout, err := Execf("which %s", name)
if err != nil || (len(strings.ReplaceAll(stdout, "\n", "")) == 0 && strings.HasPrefix(stdout, "/")) { if err != nil || (len(strings.ReplaceAll(stdout, "\n", "")) == 0) {
return false return false
} }
return true return true

Loading…
Cancel
Save