Skip to content

[stable33] fix(deploy): round the memory and CPU limits to whole numbers #1120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandr-nc merged 1 commit into from
Oct 16, 2026
Merged

[stable33] fix(deploy): round the memory and CPU limits to whole numbers #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/DeployActions/DockerActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ public function buildDeployParams(DaemonConfig $daemonConfig, array $appInfo): a
'devices' => $devices,
'deviceRequests' => $deviceRequests,
'mounts' => $appInfo['external-app']['mounts'] ?? [],
'resourceLimits' => $deployConfig['resourceLimits'] ?? []
'resourceLimits' => AppAPICommonService::buildResourceLimits($deployConfig)
];

return [
Expand Down
18 changes: 18 additions & 0 deletions lib/Service/AppAPICommonService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,22 @@ public function buildExAppHost(array $deployConfig): string {
}
return '127.0.0.1'; # fallback to loop-back adapter
}

/**
* Docker takes the memory and CPU limits as whole numbers, but the admin settings compute them from decimal
* input (`Number(cpus) * 1000000000`), which can store a value such as 1070000000.0000001.
*/
public static function buildResourceLimits(array $deployConfig): array {
$resourceLimits = $deployConfig['resourceLimits'] ?? [];
if (!is_array($resourceLimits)) {
return [];
}
foreach (['memory', 'nanoCPUs'] as $limit) {
$value = $resourceLimits[$limit] ?? null;
if (is_float($value) && abs($value) < PHP_INT_MAX) {
$resourceLimits[$limit] = (int)round($value);
}
}
return $resourceLimits;
}
}
Loading