From c77742e72eae5f95fdeb45f29735f60cadf96bff Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Mon, 15 Apr 2024 11:54:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=97=B6=E5=80=99=EF=BC=8C=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=20docker-compose.yml=20=E7=9A=84=20deploy=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8B=E5=86=85=E5=AE=B9=E4=BC=9A=E8=A2=AB=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=A6=86=E5=86=99=E7=9A=84=E9=97=AE=E9=A2=98=20(#4512)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs https://github.com/1Panel-dev/1Panel/issues/4340
---
 backend/app/service/app_utils.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go
index 42779da45..d7e02ad8c 100644
--- a/backend/app/service/app_utils.go
+++ b/backend/app/service/app_utils.go
@@ -1229,16 +1229,18 @@ func addDockerComposeCommonParam(composeMap map[string]interface{}, serviceName
 	serviceValue := service.(map[string]interface{})
 
 	deploy := map[string]interface{}{}
-
 	if de, ok := serviceValue["deploy"]; ok {
 		deploy = de.(map[string]interface{})
 	}
-	deploy["resources"] = map[string]interface{}{
-		"limits": map[string]interface{}{
-			"cpus":   "${CPUS}",
-			"memory": "${MEMORY_LIMIT}",
-		},
+	resource := map[string]interface{}{}
+	if res, ok := deploy["resources"]; ok {
+		resource = res.(map[string]interface{})
 	}
+	resource["limits"] = map[string]interface{}{
+		"cpus":   "${CPUS}",
+		"memory": "${MEMORY_LIMIT}",
+	}
+	deploy["resources"] = resource
 	serviceValue["deploy"] = deploy
 
 	ports, ok := serviceValue["ports"].([]interface{})