gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 22:18:07 +08:00
Code

feat: 修改应用重建逻辑 (#3953)

Browse Source
This commit is contained in:
zhengkunwang 2024-02-22 17:12:08 +08:00 committed by GitHub
parent 1b47e8dd63
commit e427ccf70c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -903,18 +903,19 @@ func rebuildApp(appInstall model.AppInstall) error {
_ = handleErr(appInstall, err, out) _ = handleErr(appInstall, err, out)
return return
} }
out, err = compose.Up(dockerComposePath) fileOp := files.NewFileOp()
envByte, err := fileOp.GetContent(appInstall.GetEnvPath())
if err != nil { if err != nil {
_ = handleErr(appInstall, err, out) _ = handleErr(appInstall, err, out)
return return
} }
envByte, err := files.NewFileOp().GetContent(appInstall.GetEnvPath()) composeByte, err := fileOp.GetContent(dockerComposePath)
if err != nil { if err != nil {
_ = handleErr(appInstall, err, out) _ = handleErr(appInstall, err, out)
return return
} }
project, err := composeV2.GetComposeProject(appInstall.Name, appInstall.GetPath(), []byte(appInstall.DockerCompose), envByte, true) project, err := composeV2.GetComposeProject(appInstall.Name, appInstall.GetPath(), composeByte, envByte, true)
if err != nil { if err != nil {
_ = handleErr(appInstall, err, out) _ = handleErr(appInstall, err, out)
return return