src/main/java/net/siegeln/cameleer/saas/deployment/DeploymentService.java

@@ -140,7 +140,8 @@ public class DeploymentService {
                     ),
                     runtimeConfig.parseMemoryLimitBytes(),
                     runtimeConfig.getContainerCpuShares(),
-                    runtimeConfig.getAgentHealthPort()
+                    runtimeConfig.getAgentHealthPort(),
+                    Map.of()
             ));
 
             deployment.setOrchestratorMetadata(Map.of("containerId", containerId));

src/main/java/net/siegeln/cameleer/saas/runtime/DockerRuntimeOrchestrator.java

@@ -21,6 +21,7 @@ import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 @Component
@@ -87,6 +88,7 @@ public class DockerRuntimeOrchestrator implements RuntimeOrchestrator {
         var container = dockerClient.createContainerCmd(request.imageRef())
                 .withName(request.containerName())
                 .withEnv(envList)
+                .withLabels(request.labels() != null ? request.labels() : Map.of())
                 .withHostConfig(hostConfig)
                 .withHealthcheck(new HealthCheck()
                         .withTest(List.of("CMD-SHELL",

src/main/java/net/siegeln/cameleer/saas/runtime/StartContainerRequest.java

@@ -9,5 +9,6 @@ public record StartContainerRequest(
         Map<String, String> envVars,
         long memoryLimitBytes,
         int cpuShares,
-        int healthCheckPort
+        int healthCheckPort,
+        Map<String, String> labels
 ) {}