From e427ccf70c8dc1e0ef3042bf460c0db223ec2129 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Thu, 22 Feb 2024 17:12:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=87=8D=E5=BB=BA=E9=80=BB=E8=BE=91=20(#3953)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/app_utils.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go index 1a161f6b7..9b14ba088 100644 --- a/backend/app/service/app_utils.go +++ b/backend/app/service/app_utils.go @@ -903,18 +903,19 @@ func rebuildApp(appInstall model.AppInstall) error { _ = handleErr(appInstall, err, out) return } - out, err = compose.Up(dockerComposePath) + fileOp := files.NewFileOp() + envByte, err := fileOp.GetContent(appInstall.GetEnvPath()) if err != nil { _ = handleErr(appInstall, err, out) return } - envByte, err := files.NewFileOp().GetContent(appInstall.GetEnvPath()) + composeByte, err := fileOp.GetContent(dockerComposePath) if err != nil { _ = handleErr(appInstall, err, out) 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 { _ = handleErr(appInstall, err, out) return