1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-08 22:46:51 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 容器重启前增加校验操作 (#6696)
Some checks are pending
Build Test / build-linux-binary (push) Waiting to run
Details
Build / SonarCloud (push) Waiting to run
Details
sync2gitee / repo-sync (push) Waiting to run
Details

Browse source
This commit is contained in:
John Bro 2024-10-14 10:36:55 +08:00 • committed by GitHub
parent eb99c10ad0
commit e4a634e6e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
backend/app/service/docker.go
View file

@ -4,6 +4,7 @@ import (
"bufio" "bufio"
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"os" "os"
"path" "path"
"strings" "strings"
@ -213,6 +214,9 @@ func (u *DockerService) UpdateConf(req dto.SettingUpdate) error {
if err := os.WriteFile(constant.DaemonJsonPath, newJson, 0640); err != nil { if err := os.WriteFile(constant.DaemonJsonPath, newJson, 0640); err != nil {
return err return err
} }
if err := validateDockerConfig(); err != nil {
return err
}
stdout, err := cmd.Exec("systemctl restart docker") stdout, err := cmd.Exec("systemctl restart docker")
if err != nil { if err != nil {
@ -260,6 +264,10 @@ func (u *DockerService) UpdateLogOption(req dto.LogOption) error {
return err return err
} }
if err := validateDockerConfig(); err != nil {
return err
}
stdout, err := cmd.Exec("systemctl restart docker") stdout, err := cmd.Exec("systemctl restart docker")
if err != nil { if err != nil {
return errors.New(string(stdout)) return errors.New(string(stdout))
@ -300,6 +308,10 @@ func (u *DockerService) UpdateIpv6Option(req dto.Ipv6Option) error {
return err return err
} }
if err := validateDockerConfig(); err != nil {
return err
}
stdout, err := cmd.Exec("systemctl restart docker") stdout, err := cmd.Exec("systemctl restart docker")
if err != nil { if err != nil {
return errors.New(string(stdout)) return errors.New(string(stdout))
@ -329,6 +341,10 @@ func (u *DockerService) UpdateConfByFile(req dto.DaemonJsonUpdateByFile) error {
_, _ = write.WriteString(req.File) _, _ = write.WriteString(req.File)
write.Flush() write.Flush()
if err := validateDockerConfig(); err != nil {
return err
}
stdout, err := cmd.Exec("systemctl restart docker") stdout, err := cmd.Exec("systemctl restart docker")
if err != nil { if err != nil {
return errors.New(string(stdout)) return errors.New(string(stdout))
@ -348,6 +364,13 @@ func (u *DockerService) OperateDocker(req dto.DockerOperation) error {
} }
} }
} }
if req.Operation == "restart" {
if err := validateDockerConfig(); err != nil {
return err
}
}
stdout, err := cmd.Execf("systemctl %s %s ", req.Operation, service) stdout, err := cmd.Execf("systemctl %s %s ", req.Operation, service)
if err != nil { if err != nil {
return errors.New(string(stdout)) return errors.New(string(stdout))
@ -403,3 +426,11 @@ func changeLogOption(daemonMap map[string]interface{}, logMaxFile, logMaxSize st
} }
} }
} }
func validateDockerConfig() error {
stdout, err := cmd.Exec("dockerd --validate")
if err != nil || (stdout != "" && strings.TrimSpace(stdout) != "configuration OK") {
return fmt.Errorf("Docker configuration validation failed, err: %v", stdout)
}
return nil
}

8
backend/app/service/image_repo.go
View file

@ -86,6 +86,10 @@ func (u *ImageRepoService) Create(req dto.ImageRepoCreate) error {
} }
if req.Protocol == "http" { if req.Protocol == "http" {
_ = u.handleRegistries(req.DownloadUrl, "", "create") _ = u.handleRegistries(req.DownloadUrl, "", "create")
if err := validateDockerConfig(); err != nil {
return err
}
stdout, err := cmd.Exec("systemctl restart docker") stdout, err := cmd.Exec("systemctl restart docker")
if err != nil { if err != nil {
return errors.New(string(stdout)) return errors.New(string(stdout))
@ -159,6 +163,10 @@ func (u *ImageRepoService) Update(req dto.ImageRepoUpdate) error {
if repo.Auth { if repo.Auth {
_, _ = cmd.ExecWithCheck("docker", "logout", repo.DownloadUrl) _, _ = cmd.ExecWithCheck("docker", "logout", repo.DownloadUrl)
} }
if err := validateDockerConfig(); err != nil {
return err
}
stdout, err := cmd.Exec("systemctl restart docker") stdout, err := cmd.Exec("systemctl restart docker")
if err != nil { if err != nil {
return errors.New(string(stdout)) return errors.New(string(stdout))