From 350e7699484d5d4b77368462d05e58edc04dce21 Mon Sep 17 00:00:00 2001 From: hsiegeln <37154749+hsiegeln@users.noreply.github.com> Date: Sat, 11 Apr 2026 21:33:07 +0200 Subject: [PATCH] Group container settings under cameleer.server.runtime.container.* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move container resource defaults into their own sub-namespace for future extensibility: cameleer.server.runtime.container.memorylimit → CAMELEER_SERVER_RUNTIME_CONTAINER_MEMORYLIMIT cameleer.server.runtime.container.cpushares → CAMELEER_SERVER_RUNTIME_CONTAINER_CPUSHARES Co-Authored-By: Claude Opus 4.6 (1M context) --- .../com/cameleer3/server/app/runtime/DeploymentExecutor.java | 4 ++-- cameleer3-server-app/src/main/resources/application.yml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java index e2ddeb8c..384832e1 100644 --- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java +++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java @@ -34,10 +34,10 @@ public class DeploymentExecutor { @Value("${cameleer.server.runtime.dockernetwork:cameleer}") private String dockerNetwork; - @Value("${cameleer.server.runtime.containermemorylimit:512m}") + @Value("${cameleer.server.runtime.container.memorylimit:512m}") private String globalMemoryLimit; - @Value("${cameleer.server.runtime.containercpushares:512}") + @Value("${cameleer.server.runtime.container.cpushares:512}") private int globalCpuShares; @Value("${cameleer.server.runtime.healthchecktimeout:60}") diff --git a/cameleer3-server-app/src/main/resources/application.yml b/cameleer3-server-app/src/main/resources/application.yml index 8d10f7b0..e374cfe0 100644 --- a/cameleer3-server-app/src/main/resources/application.yml +++ b/cameleer3-server-app/src/main/resources/application.yml @@ -47,8 +47,9 @@ cameleer: dockernetwork: ${CAMELEER_SERVER_RUNTIME_DOCKERNETWORK:cameleer} agenthealthport: 9464 healthchecktimeout: 60 - containermemorylimit: ${CAMELEER_SERVER_RUNTIME_CONTAINERMEMORYLIMIT:512m} - containercpushares: ${CAMELEER_SERVER_RUNTIME_CONTAINERCPUSHARES:512} + container: + memorylimit: ${CAMELEER_SERVER_RUNTIME_CONTAINER_MEMORYLIMIT:512m} + cpushares: ${CAMELEER_SERVER_RUNTIME_CONTAINER_CPUSHARES:512} routingmode: ${CAMELEER_SERVER_RUNTIME_ROUTINGMODE:path} routingdomain: ${CAMELEER_SERVER_RUNTIME_ROUTINGDOMAIN:localhost} serverurl: ${CAMELEER_SERVER_RUNTIME_SERVERURL:}