Add extraRunParams for hooks, commands, and crons

disco/endpoints/cgi.py

@@ -226,6 +226,7 @@ async def stderr(text: str) -> None:
         project_name,
         service_name,
     )
+    extra_run_params = disco_file.services[service_name].extra_run_params
     await docker.run(
         image=image,
         project_name=project_name,
@@ -237,6 +238,13 @@ async def stderr(text: str) -> None:
         stdin=content,
         stdout=stdout,
         stderr=stderr,
+        extra_params=[
+            param.strip()
+            for param in extra_run_params.split(" ")
+            if len(param.strip()) > 0
+        ]
+        if extra_run_params is not None
+        else None,
     )
     if len(cgi_err) > 0:
         log.info("Received stderr from CGI: %s", cgi_err)

disco/utils/asyncworker.py

@@ -205,6 +205,16 @@ async def update_for_deployment(
             self.next = self.cron.get_next(datetime)
         self.schedule = schedule
         self.timeout = disco_file.services[self.service_name].timeout
+        extra_run_params = disco_file.services[self.service_name].extra_run_params
+        self.extra_params = (
+            [
+                param.strip()
+                for param in extra_run_params.split(" ")
+                if len(param.strip()) > 0
+            ]
+            if extra_run_params is not None
+            else None
+        )
 
     async def run(self) -> None:
         async def log_stdout(stdout: str) -> None:
@@ -227,6 +237,7 @@ async def log_stderr(stderr: str) -> None:
             timeout=self.timeout,
             stdout=log_stdout,
             stderr=log_stderr,
+            extra_params=self.extra_params,
         )
 
     def schedule_next(self) -> None:

disco/utils/commandruns.py

@@ -81,6 +81,7 @@ async def log_output_terminate():
 
         name = f"{project_name}-run.{run_number}"
         try:
+            extra_run_params = disco_file.services[service].extra_run_params
             await docker.run(
                 image=image,
                 project_name=project_name,
@@ -92,6 +93,13 @@ async def log_output_terminate():
                 timeout=timeout,
                 stdout=log_output,
                 stderr=log_output,
+                extra_params=[
+                    param.strip()
+                    for param in extra_run_params.split(" ")
+                    if len(param.strip()) > 0
+                ]
+                if extra_run_params is not None
+                else None,
             )
         except TimeoutError:
             await log_output(f"Timed out after {timeout} seconds\n")

disco/utils/deploymentflow.py

@@ -396,6 +396,13 @@ async def run_hook_deploy_start_before(
             timeout=service.timeout,
             stdout=log_output,
             stderr=log_output,
+            extra_params=[
+                param.strip()
+                for param in service.extra_run_params.split(" ")
+                if len(param.strip()) > 0
+            ]
+            if service.extra_run_params is not None
+            else None,
         )
 
 
@@ -456,6 +463,13 @@ async def run_hook_deploy_start_after(
             timeout=service.timeout,
             stdout=log_output,
             stderr=log_output,
+            extra_params=[
+                param.strip()
+                for param in service.extra_run_params.split(" ")
+                if len(param.strip()) > 0
+            ]
+            if service.extra_run_params is not None
+            else None,
         )
 
 

disco/utils/discofile.py

@@ -59,6 +59,10 @@ class Service(BaseModel):
         None,
         alias="extraSwarmParams",
     )
+    extra_run_params: str | None = Field(
+        None,
+        alias="extraRunParams",
+    )
 
 
 class DiscoFile(BaseModel):

disco/utils/docker.py

@@ -1017,10 +1017,13 @@ async def run(
     stdin: AsyncGenerator[bytes, None] | None = None,
     workdir: str | None = None,
     timeout: int = 600,
+    extra_params: list[str] | None = None,
 ) -> None:
     log.info("Docker run %s (%s)", name, image)
     try:
         more_args = []
+        if extra_params is not None:
+            more_args.extend(extra_params)
         for var_name, var_value in env_variables:
             more_args.append("--env")
             more_args.append(f"{var_name}={var_value}")