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

fix: 解决单位转换导致的内存限制问题 (#4055)

Refs #4040
This commit is contained in:
ssongliu 2024-03-04 11:29:04 +08:00 committed by GitHub
parent e9cc7bf1cf
commit 94181538a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions

View File

@ -39,7 +39,7 @@ type ContainerInfo struct {
type ResourceLimit struct { type ResourceLimit struct {
CPU int `json:"cpu"` CPU int `json:"cpu"`
Memory int `json:"memory"` Memory uint64 `json:"memory"`
} }
type ContainerOperate struct { type ContainerOperate struct {

View File

@ -337,7 +337,7 @@ func (u *ContainerService) LoadResourceLimit() (*dto.ResourceLimit, error) {
data := dto.ResourceLimit{ data := dto.ResourceLimit{
CPU: cpuCounts, CPU: cpuCounts,
Memory: int(memoryInfo.Total), Memory: memoryInfo.Total,
} }
return &data, nil return &data, nil
} }