mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-05-30 07:20:09 +00:00
fix: validate oom_score_adj range and only set when non-zero
Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/7d889ade-ce37-4753-9711-16169f4d7252 Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
975d32962b
commit
b0842bf7ea
@@ -347,7 +347,7 @@ readonly class ContainerDefinitionFetcher {
|
||||
|
||||
$oomScoreAdj = 0;
|
||||
if (isset($entry['oom_score_adj'])) {
|
||||
$oomScoreAdj = $entry['oom_score_adj'];
|
||||
$oomScoreAdj = max(-1000, min(0, (int)$entry['oom_score_adj']));
|
||||
}
|
||||
|
||||
$containers[] = new Container(
|
||||
|
||||
@@ -394,7 +394,9 @@ readonly class DockerActionManager {
|
||||
$requestBody['StopTimeout'] = $maxShutDownTime;
|
||||
}
|
||||
|
||||
$requestBody['HostConfig']['OomScoreAdj'] = $container->oomScoreAdj;
|
||||
if ($container->oomScoreAdj !== 0) {
|
||||
$requestBody['HostConfig']['OomScoreAdj'] = $container->oomScoreAdj;
|
||||
}
|
||||
|
||||
$capAdds = $container->capAdd;
|
||||
if (count($capAdds) > 0) {
|
||||
|
||||
Reference in New Issue
Block a user