localstack-core 4.7.1.dev22__py3-none-any.whl → 4.7.1.dev24__py3-none-any.whl

localstack/utils/container_utils/container_client.py

@@ -13,13 +13,10 @@ from enum import Enum, unique
 from pathlib import Path
 from typing import (
     Callable,
-    Dict,
-    List,
     Literal,
     NamedTuple,
     Optional,
     Protocol,
-    Tuple,
     TypedDict,
     Union,
     get_args,
@@ -157,7 +154,7 @@ class Ulimit:
 
 
 # defines the type for port mappings (source->target port range)
-PortRange = Union[List, HashableList]
+PortRange = Union[list, HashableList]
 # defines the protocol for a port range ("tcp" or "udp")
 PortProtocol = str
 
@@ -176,7 +173,7 @@ class PortMappings:
     # bind host to be used for defining port mappings
     bind_host: str
     # maps `from` port range to `to` port range for port mappings
-    mappings: Dict[Tuple[PortRange, PortProtocol], List]
+    mappings: dict[tuple[PortRange, PortProtocol], list]
 
     def __init__(self, bind_host: str = None):
         self.bind_host = bind_host if bind_host else ""
@@ -253,7 +250,7 @@ class PortMappings:
 
         return " ".join([entry(k, v) for k, v in self.mappings.items()])
 
-    def to_list(self) -> List[str]:  # TODO test
+    def to_list(self) -> list[str]:  # TODO test
         bind_address = f"{self.bind_host}:" if self.bind_host else ""
 
         def entry(k, v):
@@ -269,7 +266,7 @@ class PortMappings:
 
         return [item for k, v in self.mappings.items() for item in entry(k, v)]
 
-    def to_dict(self) -> Dict[str, Union[Tuple[str, Union[int, List[int]]], int]]:
+    def to_dict(self) -> dict[str, Union[tuple[str, Union[int, list[int]]], int]]:
         bind_address = self.bind_host or ""
 
         def bind_port(bind_address, host_port):
@@ -367,7 +364,7 @@ class PortMappings:
         return f"<PortMappings: {self.to_dict()}>"
 
 
-SimpleVolumeBind = Tuple[str, str]
+SimpleVolumeBind = tuple[str, str]
 """Type alias for a simple version of VolumeBind"""
 
 
@@ -455,9 +452,9 @@ class VolumeDirMount:
 
 
 class VolumeMappings:
-    mappings: List[Union[SimpleVolumeBind, BindMount]]
+    mappings: list[Union[SimpleVolumeBind, BindMount]]
 
-    def __init__(self, mappings: List[Union[SimpleVolumeBind, BindMount, VolumeDirMount]] = None):
+    def __init__(self, mappings: list[Union[SimpleVolumeBind, BindMount, VolumeDirMount]] = None):
         self.mappings = mappings if mappings is not None else []
 
     def add(self, mapping: Union[SimpleVolumeBind, BindMount, VolumeDirMount]):
@@ -521,7 +518,7 @@ class VolumeInfo(NamedTuple):
 @dataclasses.dataclass
 class LogConfig:
     type: Literal["json-file", "syslog", "journald", "gelf", "fluentd", "none", "awslogs", "splunk"]
-    config: Dict[str, str] = dataclasses.field(default_factory=dict)
+    config: dict[str, str] = dataclasses.field(default_factory=dict)
 
 
 @dataclasses.dataclass
@@ -530,11 +527,11 @@ class ContainerConfiguration:
     name: Optional[str] = None
     volumes: VolumeMappings = dataclasses.field(default_factory=VolumeMappings)
     ports: PortMappings = dataclasses.field(default_factory=PortMappings)
-    exposed_ports: List[str] = dataclasses.field(default_factory=list)
-    entrypoint: Optional[Union[List[str], str]] = None
+    exposed_ports: list[str] = dataclasses.field(default_factory=list)
+    entrypoint: Optional[Union[list[str], str]] = None
     additional_flags: Optional[str] = None
-    command: Optional[List[str]] = None
-    env_vars: Dict[str, str] = dataclasses.field(default_factory=dict)
+    command: Optional[list[str]] = None
+    env_vars: dict[str, str] = dataclasses.field(default_factory=dict)
 
     privileged: bool = False
     remove: bool = False
@@ -544,15 +541,15 @@ class ContainerConfiguration:
 
     stdin: Optional[str] = None
     user: Optional[str] = None
-    cap_add: Optional[List[str]] = None
-    cap_drop: Optional[List[str]] = None
-    security_opt: Optional[List[str]] = None
+    cap_add: Optional[list[str]] = None
+    cap_drop: Optional[list[str]] = None
+    security_opt: Optional[list[str]] = None
     network: Optional[str] = None
     dns: Optional[str] = None
     workdir: Optional[str] = None
     platform: Optional[str] = None
-    ulimits: Optional[List[Ulimit]] = None
-    labels: Optional[Dict[str, str]] = None
+    ulimits: Optional[list[Ulimit]] = None
+    labels: Optional[dict[str, str]] = None
     init: Optional[bool] = None
     log_config: Optional[LogConfig] = None
 
@@ -577,17 +574,17 @@ class DockerRunFlags:
     create: https://docs.docker.com/engine/reference/commandline/create/
     """
 
-    env_vars: Optional[Dict[str, str]]
-    extra_hosts: Optional[Dict[str, str]]
-    labels: Optional[Dict[str, str]]
-    volumes: Optional[List[SimpleVolumeBind]]
+    env_vars: Optional[dict[str, str]]
+    extra_hosts: Optional[dict[str, str]]
+    labels: Optional[dict[str, str]]
+    volumes: Optional[list[SimpleVolumeBind]]
     network: Optional[str]
     platform: Optional[DockerPlatform]
     privileged: Optional[bool]
     ports: Optional[PortMappings]
-    ulimits: Optional[List[Ulimit]]
+    ulimits: Optional[list[Ulimit]]
     user: Optional[str]
-    dns: Optional[List[str]]
+    dns: Optional[list[str]]
 
 
 class RegistryResolverStrategy(Protocol):
@@ -621,7 +618,7 @@ class ContainerClient(metaclass=ABCMeta):
         """Returns the usage statistics of the container with the given name"""
         pass
 
-    def get_networks(self, container_name: str) -> List[str]:
+    def get_networks(self, container_name: str) -> list[str]:
         LOG.debug("Getting networks for container: %s", container_name)
         container_attrs = self.inspect_container(container_name_or_id=container_name)
         return list(container_attrs["NetworkSettings"].get("Networks", {}).keys())
@@ -701,13 +698,13 @@ class ContainerClient(metaclass=ABCMeta):
         """
 
     @abstractmethod
-    def list_containers(self, filter: Union[List[str], str, None] = None, all=True) -> List[dict]:
+    def list_containers(self, filter: Union[list[str], str, None] = None, all=True) -> list[dict]:
         """List all containers matching the given filters
 
         :return: A list of dicts with keys id, image, name, labels, status
         """
 
-    def get_running_container_names(self) -> List[str]:
+    def get_running_container_names(self) -> list[str]:
         """Returns a list of the names of all running containers"""
         result = self.list_containers(all=False)
         result = [container["name"] for container in result]
@@ -798,7 +795,7 @@ class ContainerClient(metaclass=ABCMeta):
         strip_latest: bool = True,
         include_tags: bool = True,
         strip_wellknown_repo_prefixes: bool = True,
-    ) -> List[str]:
+    ) -> list[str]:
         """
         Get all names of docker images available to the container engine
         :param strip_latest: return images both with and without :latest tag
@@ -817,13 +814,13 @@ class ContainerClient(metaclass=ABCMeta):
         """Returns a blocking generator you can iterate over to retrieve log output as it happens."""
 
     @abstractmethod
-    def inspect_container(self, container_name_or_id: str) -> Dict[str, Union[Dict, str]]:
+    def inspect_container(self, container_name_or_id: str) -> dict[str, Union[dict, str]]:
         """Get detailed attributes of a container.
 
         :return: Dict containing docker attributes as returned by the daemon
         """
 
-    def inspect_container_volumes(self, container_name_or_id) -> List[VolumeInfo]:
+    def inspect_container_volumes(self, container_name_or_id) -> list[VolumeInfo]:
         """Return information about the volumes mounted into the given container.
 
         :param container_name_or_id: the container name or id
@@ -838,7 +835,7 @@ class ContainerClient(metaclass=ABCMeta):
     @abstractmethod
     def inspect_image(
         self, image_name: str, pull: bool = True, strip_wellknown_repo_prefixes: bool = True
-    ) -> Dict[str, Union[dict, list, str]]:
+    ) -> dict[str, Union[dict, list, str]]:
         """Get detailed attributes of an image.
 
         :param image_name: Image name to inspect
@@ -864,7 +861,7 @@ class ContainerClient(metaclass=ABCMeta):
         """
 
     @abstractmethod
-    def inspect_network(self, network_name: str) -> Dict[str, Union[Dict, str]]:
+    def inspect_network(self, network_name: str) -> dict[str, Union[dict, str]]:
         """Get detailed attributes of an network.
 
         :return: Dict containing docker attributes as returned by the daemon
@@ -875,8 +872,8 @@ class ContainerClient(metaclass=ABCMeta):
         self,
         network_name: str,
         container_name_or_id: str,
-        aliases: Optional[List] = None,
-        link_local_ips: List[str] = None,
+        aliases: Optional[list] = None,
+        link_local_ips: list[str] = None,
     ) -> None:
         """
         Connects a container to a given network
@@ -911,7 +908,7 @@ class ContainerClient(metaclass=ABCMeta):
         If container has multiple networks, it will return the IP of the first
         """
 
-    def get_image_cmd(self, docker_image: str, pull: bool = True) -> List[str]:
+    def get_image_cmd(self, docker_image: str, pull: bool = True) -> list[str]:
         """Get the command for the given image
         :param docker_image: Docker image to inspect
         :param pull: Whether to pull if image is not present
@@ -988,28 +985,28 @@ class ContainerClient(metaclass=ABCMeta):
         image_name: str,
         *,
         name: Optional[str] = None,
-        entrypoint: Optional[Union[List[str], str]] = None,
+        entrypoint: Optional[Union[list[str], str]] = None,
         remove: bool = False,
         interactive: bool = False,
         tty: bool = False,
         detach: bool = False,
-        command: Optional[Union[List[str], str]] = None,
-        volumes: Optional[Union[VolumeMappings, List[SimpleVolumeBind]]] = None,
+        command: Optional[Union[list[str], str]] = None,
+        volumes: Optional[Union[VolumeMappings, list[SimpleVolumeBind]]] = None,
         ports: Optional[PortMappings] = None,
-        exposed_ports: Optional[List[str]] = None,
-        env_vars: Optional[Dict[str, str]] = None,
+        exposed_ports: Optional[list[str]] = None,
+        env_vars: Optional[dict[str, str]] = None,
         user: Optional[str] = None,
-        cap_add: Optional[List[str]] = None,
-        cap_drop: Optional[List[str]] = None,
-        security_opt: Optional[List[str]] = None,
+        cap_add: Optional[list[str]] = None,
+        cap_drop: Optional[list[str]] = None,
+        security_opt: Optional[list[str]] = None,
         network: Optional[str] = None,
-        dns: Optional[Union[str, List[str]]] = None,
+        dns: Optional[Union[str, list[str]]] = None,
         additional_flags: Optional[str] = None,
         workdir: Optional[str] = None,
         privileged: Optional[bool] = None,
-        labels: Optional[Dict[str, str]] = None,
+        labels: Optional[dict[str, str]] = None,
         platform: Optional[DockerPlatform] = None,
-        ulimits: Optional[List[Ulimit]] = None,
+        ulimits: Optional[list[Ulimit]] = None,
         init: Optional[bool] = None,
         log_config: Optional[LogConfig] = None,
     ) -> str:
@@ -1030,26 +1027,26 @@ class ContainerClient(metaclass=ABCMeta):
         interactive: bool = False,
         tty: bool = False,
         detach: bool = False,
-        command: Optional[Union[List[str], str]] = None,
-        volumes: Optional[Union[VolumeMappings, List[SimpleVolumeBind]]] = None,
+        command: Optional[Union[list[str], str]] = None,
+        volumes: Optional[Union[VolumeMappings, list[SimpleVolumeBind]]] = None,
         ports: Optional[PortMappings] = None,
-        exposed_ports: Optional[List[str]] = None,
-        env_vars: Optional[Dict[str, str]] = None,
+        exposed_ports: Optional[list[str]] = None,
+        env_vars: Optional[dict[str, str]] = None,
         user: Optional[str] = None,
-        cap_add: Optional[List[str]] = None,
-        cap_drop: Optional[List[str]] = None,
-        security_opt: Optional[List[str]] = None,
+        cap_add: Optional[list[str]] = None,
+        cap_drop: Optional[list[str]] = None,
+        security_opt: Optional[list[str]] = None,
         network: Optional[str] = None,
         dns: Optional[str] = None,
         additional_flags: Optional[str] = None,
         workdir: Optional[str] = None,
-        labels: Optional[Dict[str, str]] = None,
+        labels: Optional[dict[str, str]] = None,
         platform: Optional[DockerPlatform] = None,
         privileged: Optional[bool] = None,
-        ulimits: Optional[List[Ulimit]] = None,
+        ulimits: Optional[list[Ulimit]] = None,
         init: Optional[bool] = None,
         log_config: Optional[LogConfig] = None,
-    ) -> Tuple[bytes, bytes]:
+    ) -> tuple[bytes, bytes]:
         """Creates and runs a given docker container
 
         :return: A tuple (stdout, stderr)
@@ -1057,7 +1054,7 @@ class ContainerClient(metaclass=ABCMeta):
 
     def run_container_from_config(
         self, container_config: ContainerConfiguration
-    ) -> Tuple[bytes, bytes]:
+    ) -> tuple[bytes, bytes]:
         """Like ``run_container`` but uses the parameters from the configuration."""
 
         return self.run_container(
@@ -1093,14 +1090,14 @@ class ContainerClient(metaclass=ABCMeta):
     def exec_in_container(
         self,
         container_name_or_id: str,
-        command: Union[List[str], str],
+        command: Union[list[str], str],
         interactive: bool = False,
         detach: bool = False,
-        env_vars: Optional[Dict[str, Optional[str]]] = None,
+        env_vars: Optional[dict[str, Optional[str]]] = None,
         stdin: Optional[bytes] = None,
         user: Optional[str] = None,
         workdir: Optional[str] = None,
-    ) -> Tuple[bytes, bytes]:
+    ) -> tuple[bytes, bytes]:
         """Execute a given command in a container
 
         :return: A tuple (stdout, stderr)
@@ -1114,7 +1111,7 @@ class ContainerClient(metaclass=ABCMeta):
         interactive: bool = False,
         attach: bool = False,
         flags: Optional[str] = None,
-    ) -> Tuple[bytes, bytes]:
+    ) -> tuple[bytes, bytes]:
         """Start a given, already created container
 
         :return: A tuple (stdout, stderr) if attach or interactive is set, otherwise a tuple (b"container_name_or_id", b"")
@@ -1147,7 +1144,7 @@ class Util:
         return f"{key}={value}"
 
     @classmethod
-    def create_env_vars_file_flag(cls, env_vars: Dict) -> Tuple[List[str], Optional[str]]:
+    def create_env_vars_file_flag(cls, env_vars: dict) -> tuple[list[str], Optional[str]]:
         if not env_vars:
             return [], None
         result = []
@@ -1185,14 +1182,14 @@ class Util:
         return f
 
     @staticmethod
-    def append_without_latest(image_names: List[str]):
+    def append_without_latest(image_names: list[str]):
         suffix = ":latest"
         for image in list(image_names):
             if image.endswith(suffix):
                 image_names.append(image[: -len(suffix)])
 
     @staticmethod
-    def strip_wellknown_repo_prefixes(image_names: List[str]) -> List[str]:
+    def strip_wellknown_repo_prefixes(image_names: list[str]) -> list[str]:
         """
         Remove well-known repo prefixes like `localhost/` or `docker.io/library/` from the list of given
         image names. This is mostly to ensure compatibility of our Docker client with Podman API responses.
@@ -1238,7 +1235,7 @@ class Util:
                     LOG.debug("File to copy empty, ignoring...")
 
     @staticmethod
-    def _read_docker_cli_env_file(env_file: str) -> Dict[str, str]:
+    def _read_docker_cli_env_file(env_file: str) -> dict[str, str]:
         """
         Read an environment file in docker CLI format, specified here:
         https://docs.docker.com/reference/cli/docker/container/run/#env
@@ -1247,7 +1244,7 @@ class Util:
         """
         env_vars = {}
         try:
-            with open(env_file, mode="rt") as f:
+            with open(env_file) as f:
                 env_file_lines = f.readlines()
         except FileNotFoundError as e:
             LOG.error(
@@ -1280,16 +1277,16 @@ class Util:
     @staticmethod
     def parse_additional_flags(
         additional_flags: str,
-        env_vars: Optional[Dict[str, str]] = None,
-        labels: Optional[Dict[str, str]] = None,
-        volumes: Optional[List[SimpleVolumeBind]] = None,
+        env_vars: Optional[dict[str, str]] = None,
+        labels: Optional[dict[str, str]] = None,
+        volumes: Optional[list[SimpleVolumeBind]] = None,
         network: Optional[str] = None,
         platform: Optional[DockerPlatform] = None,
         ports: Optional[PortMappings] = None,
         privileged: Optional[bool] = None,
         user: Optional[str] = None,
-        ulimits: Optional[List[Ulimit]] = None,
-        dns: Optional[Union[str, List[str]]] = None,
+        ulimits: Optional[list[Ulimit]] = None,
+        dns: Optional[Union[str, list[str]]] = None,
     ) -> DockerRunFlags:
         """Parses additional CLI-formatted Docker flags, which could overwrite provided defaults.
         :param additional_flags: String which contains the flag definitions inspired by the Docker CLI reference:
@@ -1510,8 +1507,8 @@ class Util:
 
     @staticmethod
     def convert_mount_list_to_dict(
-        volumes: Union[List[SimpleVolumeBind], VolumeMappings],
-    ) -> Dict[str, Dict[str, str]]:
+        volumes: Union[list[SimpleVolumeBind], VolumeMappings],
+    ) -> dict[str, dict[str, str]]:
         """Converts a List of (host_path, container_path) tuples to a Dict suitable as volume argument for docker sdk"""
 
         def _map_to_dict(paths: SimpleVolumeBind | BindMount | VolumeDirMount):

localstack/utils/container_utils/docker_cmd_client.py

@@ -6,7 +6,7 @@ import os
 import re
 import shlex
 import subprocess
-from typing import Callable, Dict, List, Optional, Tuple, Union
+from typing import Callable, Optional, Union
 
 from localstack import config
 from localstack.utils.collections import ensure_list
@@ -98,7 +98,7 @@ class CmdDockerClient(ContainerClient):
 
     default_run_outfile: Optional[str] = None
 
-    def _docker_cmd(self) -> List[str]:
+    def _docker_cmd(self) -> list[str]:
         """
         Get the configured, tested Docker CMD.
         :return: string to be used for running Docker commands
@@ -281,7 +281,7 @@ class CmdDockerClient(ContainerClient):
                 "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
             ) from e
 
-    def list_containers(self, filter: Union[List[str], str, None] = None, all=True) -> List[dict]:
+    def list_containers(self, filter: Union[list[str], str, None] = None, all=True) -> list[dict]:
         filter = [filter] if isinstance(filter, str) else filter
         cmd = self._docker_cmd()
         cmd.append("ps")
@@ -489,7 +489,7 @@ class CmdDockerClient(ContainerClient):
 
         return CancellableProcessStream(process)
 
-    def _inspect_object(self, object_name_or_id: str) -> Dict[str, Union[dict, list, str]]:
+    def _inspect_object(self, object_name_or_id: str) -> dict[str, Union[dict, list, str]]:
         cmd = self._docker_cmd()
         cmd += ["inspect", "--format", "{{json .}}", object_name_or_id]
         try:
@@ -516,7 +516,7 @@ class CmdDockerClient(ContainerClient):
             )
         return object_data
 
-    def inspect_container(self, container_name_or_id: str) -> Dict[str, Union[Dict, str]]:
+    def inspect_container(self, container_name_or_id: str) -> dict[str, Union[dict, str]]:
         try:
             return self._inspect_object(container_name_or_id)
         except NoSuchObject as e:
@@ -527,7 +527,7 @@ class CmdDockerClient(ContainerClient):
         image_name: str,
         pull: bool = True,
         strip_wellknown_repo_prefixes: bool = True,
-    ) -> Dict[str, Union[dict, list, str]]:
+    ) -> dict[str, Union[dict, list, str]]:
         image_name = self.registry_resolver_strategy.resolve(image_name)
         try:
             result = self._inspect_object(image_name)
@@ -569,7 +569,7 @@ class CmdDockerClient(ContainerClient):
                     "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
                 ) from e
 
-    def inspect_network(self, network_name: str) -> Dict[str, Union[Dict, str]]:
+    def inspect_network(self, network_name: str) -> dict[str, Union[dict, str]]:
         try:
             return self._inspect_object(network_name)
         except NoSuchObject as e:
@@ -579,8 +579,8 @@ class CmdDockerClient(ContainerClient):
         self,
         network_name: str,
         container_name_or_id: str,
-        aliases: Optional[List] = None,
-        link_local_ips: List[str] = None,
+        aliases: Optional[list] = None,
+        link_local_ips: list[str] = None,
     ) -> None:
         LOG.debug(
             "Connecting container '%s' to network '%s' with aliases '%s'",
@@ -657,7 +657,7 @@ class CmdDockerClient(ContainerClient):
                 "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
             ) from e
 
-    @functools.lru_cache(maxsize=None)
+    @functools.cache
     def has_docker(self) -> bool:
         try:
             # do not use self._docker_cmd here (would result in a loop)
@@ -685,7 +685,7 @@ class CmdDockerClient(ContainerClient):
         finally:
             Util.rm_env_vars_file(env_file)
 
-    def run_container(self, image_name: str, stdin=None, **kwargs) -> Tuple[bytes, bytes]:
+    def run_container(self, image_name: str, stdin=None, **kwargs) -> tuple[bytes, bytes]:
         image_name = self.registry_resolver_strategy.resolve(image_name)
         cmd, env_file = self._build_run_create_cmd("run", image_name, **kwargs)
         LOG.debug("Run container with cmd: %s", cmd)
@@ -701,14 +701,14 @@ class CmdDockerClient(ContainerClient):
     def exec_in_container(
         self,
         container_name_or_id: str,
-        command: Union[List[str], str],
+        command: Union[list[str], str],
         interactive=False,
         detach=False,
-        env_vars: Optional[Dict[str, Optional[str]]] = None,
+        env_vars: Optional[dict[str, Optional[str]]] = None,
         stdin: Optional[bytes] = None,
         user: Optional[str] = None,
         workdir: Optional[str] = None,
-    ) -> Tuple[bytes, bytes]:
+    ) -> tuple[bytes, bytes]:
         env_file = None
         cmd = self._docker_cmd()
         cmd.append("exec")
@@ -724,7 +724,7 @@ class CmdDockerClient(ContainerClient):
             env_flag, env_file = Util.create_env_vars_file_flag(env_vars)
             cmd += env_flag
         cmd.append(container_name_or_id)
-        cmd += command if isinstance(command, List) else [command]
+        cmd += command if isinstance(command, list) else [command]
         LOG.debug("Execute command in container: %s", cmd)
         try:
             return self._run_async_cmd(cmd, stdin, container_name_or_id)
@@ -738,7 +738,7 @@ class CmdDockerClient(ContainerClient):
         interactive: bool = False,
         attach: bool = False,
         flags: Optional[str] = None,
-    ) -> Tuple[bytes, bytes]:
+    ) -> tuple[bytes, bytes]:
         cmd = self._docker_cmd() + ["start"]
         if flags:
             cmd.append(flags)
@@ -756,8 +756,8 @@ class CmdDockerClient(ContainerClient):
         return self._run_async_cmd(cmd, stdin=None, container_name=container_name_or_id)
 
     def _run_async_cmd(
-        self, cmd: List[str], stdin: bytes, container_name: str, image_name=None
-    ) -> Tuple[bytes, bytes]:
+        self, cmd: list[str], stdin: bytes, container_name: str, image_name=None
+    ) -> tuple[bytes, bytes]:
         kwargs = {
             "inherit_env": True,
             "asynchronous": True,
@@ -796,31 +796,31 @@ class CmdDockerClient(ContainerClient):
         image_name: str,
         *,
         name: Optional[str] = None,
-        entrypoint: Optional[Union[List[str], str]] = None,
+        entrypoint: Optional[Union[list[str], str]] = None,
         remove: bool = False,
         interactive: bool = False,
         tty: bool = False,
         detach: bool = False,
-        command: Optional[Union[List[str], str]] = None,
-        volumes: Optional[List[SimpleVolumeBind]] = None,
+        command: Optional[Union[list[str], str]] = None,
+        volumes: Optional[list[SimpleVolumeBind]] = None,
         ports: Optional[PortMappings] = None,
-        exposed_ports: Optional[List[str]] = None,
-        env_vars: Optional[Dict[str, str]] = None,
+        exposed_ports: Optional[list[str]] = None,
+        env_vars: Optional[dict[str, str]] = None,
         user: Optional[str] = None,
-        cap_add: Optional[List[str]] = None,
-        cap_drop: Optional[List[str]] = None,
-        security_opt: Optional[List[str]] = None,
+        cap_add: Optional[list[str]] = None,
+        cap_drop: Optional[list[str]] = None,
+        security_opt: Optional[list[str]] = None,
         network: Optional[str] = None,
-        dns: Optional[Union[str, List[str]]] = None,
+        dns: Optional[Union[str, list[str]]] = None,
         additional_flags: Optional[str] = None,
         workdir: Optional[str] = None,
         privileged: Optional[bool] = None,
-        labels: Optional[Dict[str, str]] = None,
+        labels: Optional[dict[str, str]] = None,
         platform: Optional[DockerPlatform] = None,
-        ulimits: Optional[List[Ulimit]] = None,
+        ulimits: Optional[list[Ulimit]] = None,
         init: Optional[bool] = None,
         log_config: Optional[LogConfig] = None,
-    ) -> Tuple[List[str], str]:
+    ) -> tuple[list[str], str]:
         env_file = None
         cmd = self._docker_cmd() + [action]
         if remove:
@@ -888,7 +888,7 @@ class CmdDockerClient(ContainerClient):
             cmd += shlex.split(additional_flags)
         cmd.append(image_name)
         if command:
-            cmd += command if isinstance(command, List) else [command]
+            cmd += command if isinstance(command, list) else [command]
         return cmd, env_file
 
     @staticmethod
@@ -922,13 +922,13 @@ class CmdDockerClient(ContainerClient):
         if any(msg.lower() in process_stdout_lower for msg in error_messages):
             raise NoSuchContainer(container_name_or_id, stdout=error.stdout, stderr=error.stderr)
 
-    def _transform_container_labels(self, labels: Union[str, Dict[str, str]]) -> Dict[str, str]:
+    def _transform_container_labels(self, labels: Union[str, dict[str, str]]) -> dict[str, str]:
         """
         Transforms the container labels returned by the docker command from the key-value pair format to a dict
         :param labels: Input string, comma separated key value pairs. Example: key1=value1,key2=value2
         :return: Dict representation of the passed values, example: {"key1": "value1", "key2": "value2"}
         """
-        if isinstance(labels, Dict):
+        if isinstance(labels, dict):
             return labels
 
         labels = labels.split(",")