gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-14 01:34:47 +08:00
Code

fix: 镜像仓库校验判断修改 (#1187)

Browse Source
This commit is contained in:
ssongliu 2023-05-30 13:56:57 +08:00 committed by GitHub
parent f51b09dc40
commit 4b3c9419f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/app/service/image_repo.go
View File

@ -50,9 +50,11 @@ func (u *ImageRepoService) Login(req dto.OperateByID) error {
if err != nil { if err != nil {
return err return err
} }
if err := u.CheckConn(repo.DownloadUrl, repo.Username, repo.Password); err != nil { if repo.Auth {
_ = imageRepoRepo.Update(repo.ID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error}) if err := u.CheckConn(repo.DownloadUrl, repo.Username, repo.Password); err != nil {
return err _ = imageRepoRepo.Update(repo.ID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
return err
}
} }
_ = imageRepoRepo.Update(repo.ID, map[string]interface{}{"status": constant.StatusSuccess}) _ = imageRepoRepo.Update(repo.ID, map[string]interface{}{"status": constant.StatusSuccess})
return nil return nil
@ -111,9 +113,11 @@ func (u *ImageRepoService) Create(req dto.ImageRepoCreate) error {
} }
imageRepo.Status = constant.StatusSuccess imageRepo.Status = constant.StatusSuccess
if err := u.CheckConn(req.DownloadUrl, req.Username, req.Password); err != nil { if req.Auth {
imageRepo.Status = constant.StatusFailed if err := u.CheckConn(req.DownloadUrl, req.Username, req.Password); err != nil {
imageRepo.Message = err.Error() imageRepo.Status = constant.StatusFailed
imageRepo.Message = err.Error()
}
} }
if err := imageRepoRepo.Create(&imageRepo); err != nil { if err := imageRepoRepo.Create(&imageRepo); err != nil {
return err return err
@ -142,7 +146,7 @@ func (u *ImageRepoService) Update(req dto.ImageRepoUpdate) error {
if err != nil { if err != nil {
return err return err
} }
if repo.DownloadUrl != req.DownloadUrl { if repo.DownloadUrl != req.DownloadUrl || (!repo.Auth && req.Auth) {
_ = u.handleRegistries(req.DownloadUrl, repo.DownloadUrl, "update") _ = u.handleRegistries(req.DownloadUrl, repo.DownloadUrl, "update")
if repo.Auth { if repo.Auth {
_, _ = cmd.Execf("docker logout %s", repo.DownloadUrl) _, _ = cmd.Execf("docker logout %s", repo.DownloadUrl)
@ -162,9 +166,11 @@ func (u *ImageRepoService) Update(req dto.ImageRepoUpdate) error {
upMap["status"] = constant.StatusSuccess upMap["status"] = constant.StatusSuccess
upMap["message"] = "" upMap["message"] = ""
if err := u.CheckConn(req.DownloadUrl, req.Username, req.Password); err != nil { if req.Auth {
upMap["status"] = constant.StatusFailed if err := u.CheckConn(req.DownloadUrl, req.Username, req.Password); err != nil {
upMap["message"] = err.Error() upMap["status"] = constant.StatusFailed
upMap["message"] = err.Error()
}
} }
return imageRepoRepo.Update(req.ID, upMap) return imageRepoRepo.Update(req.ID, upMap)
} }