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

fix: 解决应用内存限制回显失败的问题 (#1237)

Browse Source
This commit is contained in:
zhengkunwang223 2023-06-02 17:45:24 +08:00 committed by GitHub
parent 3773d64aa7
commit 957499e4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -900,7 +900,7 @@ func getAppCommonConfig(envs map[string]interface{}) request.AppContainerConfig
config.CpuQuota = 0 config.CpuQuota = 0
} }
if memLimit, ok := envs[constant.MemoryLimit]; ok { if memLimit, ok := envs[constant.MemoryLimit]; ok {
re := regexp.MustCompile(`(\d+(?:\.\d+)?)\s*([KMGT]?B)`) re := regexp.MustCompile(`(\d+)([A-Za-z]+)`)
matches := re.FindStringSubmatch(memLimit.(string)) matches := re.FindStringSubmatch(memLimit.(string))
if len(matches) == 3 { if len(matches) == 3 {
num, err := strconv.ParseFloat(matches[1], 64) num, err := strconv.ParseFloat(matches[1], 64)