Merge branch 'dev' into staging

deNBI · Apr 3, 2024 · 11630ac · 11630ac
2 parents 17c166b + 5a6437e
commit 11630ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docker-compose.bibigrid.host.yml b/docker-compose.bibigrid.host.yml
@@ -40,7 +40,7 @@ services:
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.13.0
+    image: docker.elastic.co/beats/filebeat:8.13.1
     network_mode: host  # Use the host network namespace
 
     env_file:

diff --git a/simple_vm_client/VirtualMachineHandler.py b/simple_vm_client/VirtualMachineHandler.py
@@ -356,6 +356,7 @@ def start_server(
         additional_keys: list[str],
         research_environment: str,
         additional_security_group_ids: list[str],
+        slurm_version: str = None,
     ) -> str:
         if research_environment:
             research_environment_metadata = (
@@ -376,6 +377,7 @@ def start_server(
             additional_keys=additional_keys,
             research_environment_metadata=research_environment_metadata,
             additional_security_group_ids=additional_security_group_ids,
+            slurm_version=slurm_version,
         )
 
     def start_server_with_custom_key(