refactor: rename execution entrypoint to command script

Signed-off-by: thxCode <[email protected]>

Author: thxCode

gpustack_runtime/cmds/deployer.py

@@ -85,7 +85,7 @@ class CreateRunnerWorkloadSubCommand(SubCommand):
 
     backend: str
     device: str
-    entrypoint: str
+    command_script: str
     port: int
     host_network: bool
     check: bool
@@ -118,9 +118,9 @@ def register(parser: _SubParsersAction):
         )
 
         deploy_parser.add_argument(
-            "--entrypoint-file",
+            "--command-script-file",
             type=str,
-            help="Path of entrypoint for the workload",
+            help="Path of command script for the workload",
         )
 
         deploy_parser.add_argument(
@@ -192,12 +192,14 @@ def __init__(self, args: Namespace):
             msg = "The name and volume arguments are required."
             raise ValueError(msg)
 
-        if args.entrypoint_file:
-            entrypoint_file = Path(args.entrypoint_file)
-            if not entrypoint_file.is_file():
-                msg = f"The entrypoint file '{entrypoint_file}' does not exist."
+        if args.command_script_file:
+            command_script_file = Path(args.command_script_file)
+            if not command_script_file.is_file():
+                msg = f"The command script file '{command_script_file}' does not exist."
                 raise ValueError(msg)
-            self.entrypoint = entrypoint_file.read_text(encoding="utf-8").strip()
+            self.command_script = command_script_file.read_text(
+                encoding="utf-8",
+            ).strip()
 
     def run(self):
         env = [
@@ -230,7 +232,7 @@ def run(self):
         ]
         execution = ContainerExecution(
             privileged=True,
-            entrypoint=self.entrypoint,
+            command_script=self.command_script,
             args=self.extra_args,
         )
         ports = (
@@ -315,7 +317,7 @@ class CreateWorkloadSubCommand(SubCommand):
 
     backend: str
     device: str
-    entrypoint: str
+    command_script: str
     port: int
     host_network: bool
     check: bool
@@ -347,9 +349,9 @@ def register(parser: _SubParsersAction):
         )
 
         deploy_parser.add_argument(
-            "--entrypoint-file",
+            "--command-script-file",
             type=str,
-            help="Path of entrypoint for the workload",
+            help="Path of command script for the workload",
         )
 
         deploy_parser.add_argument(
@@ -420,12 +422,14 @@ def __init__(self, args: Namespace):
             msg = "The name, image, and volume arguments are required."
             raise ValueError(msg)
 
-        if args.entrypoint_file:
-            entrypoint_file = Path(args.entrypoint_file)
-            if not entrypoint_file.is_file():
-                msg = f"The entrypoint file '{entrypoint_file}' does not exist."
+        if args.command_script_file:
+            command_script_file = Path(args.command_script_file)
+            if not command_script_file.is_file():
+                msg = f"The command script file '{command_script_file}' does not exist."
                 raise ValueError(msg)
-            self.entrypoint = entrypoint_file.read_text(encoding="utf-8").strip()
+            self.command_script = command_script_file.read_text(
+                encoding="utf-8",
+            ).strip()
 
     def run(self):
         env = [
@@ -458,7 +462,7 @@ def run(self):
         ]
         execution = ContainerExecution(
             privileged=True,
-            entrypoint=self.entrypoint,
+            command_script=self.command_script,
             args=self.extra_args,
         )
         ports = (

gpustack_runtime/deployer/__types__.py

@@ -170,8 +170,10 @@ class ContainerExecution(ContainerSecurity):
     Attributes:
         working_dir (str | None):
             Working directory for the container.
-        entrypoint (str | None):
-            Entrypoint content for the container,
+        command (list[str] | None):
+            Command to run in the container.
+        command_script (str | None):
+            Command(in form of script) for the container,
             only work if `readonly_rootfs` is False.
             When it is set, it will override the `command` field.
             For example,
@@ -182,8 +184,6 @@ class ContainerExecution(ContainerSecurity):
                 echo "Hello, World!"
                 exec /path/to/bin "$@"
             ```
-        command (list[str] | None):
-            Command to run in the container.
         args (list[str] | None):
             Arguments to pass to the command.
         run_as_user (int | None):
@@ -204,9 +204,13 @@ class ContainerExecution(ContainerSecurity):
     """
     Working directory for the container.
     """
-    entrypoint: str | None = None
+    command: list[str] | None = None
+    """
+    Command to run in the container.
+    """
+    command_script: str | None = None
     """
-    Entrypoint content for the container,
+    Command(in form of script) for the container,
     only work if `readonly_rootfs` is False.
     When it is set, it will override the `command` field.
     For example,
@@ -218,10 +222,6 @@ class ContainerExecution(ContainerSecurity):
         exec /path/to/bin "$@"
     ```
     """
-    command: list[str] | None = None
-    """
-    Command to run in the container.
-    """
     args: list[str] | None = None
     """
     Arguments to pass to the command.
@@ -1001,22 +1001,22 @@ def validate_and_default(self):
                     c.restart_policy = ContainerRestartPolicyEnum.NEVER
             elif not c.restart_policy:
                 c.restart_policy = ContainerRestartPolicyEnum.ALWAYS
-            # Mutate container entrypoint.
-            if c.execution and c.execution.entrypoint:
+            # Mutate container command.
+            if c.execution and c.execution.command_script:
                 if c.execution.readonly_rootfs:
-                    msg = f"Readonly rootfs Container '{c.name}' cannot have an entrypoint."
+                    msg = f"Readonly rootfs Container '{c.name}' cannot configure `command_script`."
                     raise ValueError(msg)
-                entrypoint_script_name = f"/gpustack-entrypoint-{fnv1a_32_hex(c.name)}"
-                entrypoint_file = ContainerFile(
-                    path=entrypoint_script_name,
+                command_script_name = f"/gpustack-command-{fnv1a_32_hex(c.name)}"
+                command_script = ContainerFile(
+                    path=command_script_name,
                     mode=0o755,
-                    content=c.execution.entrypoint,
+                    content=c.execution.command_script,
                 )
                 if not c.files:
                     c.files = []
-                c.files.append(entrypoint_file)
-                c.execution.command = [entrypoint_script_name]  # Override command.
-                c.execution.entrypoint = None
+                c.files.append(command_script)
+                c.execution.command = [command_script_name]  # Override command.
+                c.execution.command_script = None
             # Add default registry if needed.
             if (
                 envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY