From b0842bf7eae3f56a06ce453d9365d30357ef4983 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 12 May 2026 10:35:34 +0000 Subject: [PATCH] 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> --- php/src/ContainerDefinitionFetcher.php | 2 +- php/src/Docker/DockerActionManager.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 213b3c78..4f7c7387 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -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( diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php index af24f749..d2b68db1 100644 --- a/php/src/Docker/DockerActionManager.php +++ b/php/src/Docker/DockerActionManager.php @@ -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) {