zishuo/1Panel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 应用安装增加镜像拉取 (#1517)

Browse Source
This commit is contained in:
zhengkunwang223
2023-07-03 21:56:14 +08:00
committed by GitHub
parent fdf2a9d247
commit 555a32c273
10 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/app/service/app_utils.go
View File

@@ -576,8 +576,14 @@ func upApp(appInstall *model.AppInstall) {
if err != nil {
return err
}
err = composeService.ComposePull()
if err != nil {
appInstall.Status = constant.PullErr
return err
}
err = composeService.ComposeUp()
if err != nil {
appInstall.Status = constant.Error
return err
}
return
@@ -586,8 +592,14 @@ func upApp(appInstall *model.AppInstall) {
}
}
if err := upProject(appInstall); err != nil {
appInstall.Status = constant.Error
appInstall.Message = err.Error()
otherMsg := ""
if strings.Contains(err.Error(), "no such host") {
otherMsg = i18n.GetMsgByKey("ErrNoSuchHost") + ":"
}
if strings.Contains(err.Error(), "timeout") {
otherMsg = i18n.GetMsgByKey("ErrImagePullTimeOut") + ":"
}
appInstall.Message = otherMsg + err.Error()
} else {
appInstall.Status = constant.Running
}
@@ -751,7 +763,7 @@ func handleErr(install model.AppInstall, err error, out string) error {
func handleInstalled(appInstallList []model.AppInstall, updated bool) ([]response.AppInstalledDTO, error) {
var res []response.AppInstalledDTO
for _, installed := range appInstallList {
if updated && installed.App.Type == "php" || installed.Status == constant.Installing {
if updated && (installed.App.Type == "php" || installed.Status == constant.Installing) {
continue
}
installDTO := response.AppInstalledDTO{