experiment: try class attribute

simonrw · simonrw · commit b2bd45d18399 · 2025-05-30T20:55:07.000+01:00
diff --git a/localstack-core/localstack/utils/container_utils/container_client.py b/localstack-core/localstack/utils/container_utils/container_client.py
@@ -601,8 +601,7 @@ def resolve(self, image_name: str) -> str:  # noqa
 # TODO: remove Docker/Podman compatibility switches (in particular strip_wellknown_repo_prefixes=...)
 #  from the container client base interface and introduce derived Podman client implementations instead!
 class ContainerClient(metaclass=ABCMeta):
-    def __init__(self):
-        self.registry_resolver_strategy: RegistryResolverStrategy = HardCodedResolver()
+    registry_resolver_strategy: RegistryResolverStrategy = HardCodedResolver()
 
     @abstractmethod
     def get_system_info(self) -> dict:
diff --git a/localstack-core/localstack/utils/container_utils/docker_cmd_client.py b/localstack-core/localstack/utils/container_utils/docker_cmd_client.py
@@ -356,6 +356,7 @@ def copy_from_container(
 
     def pull_image(self, docker_image: str, platform: Optional[DockerPlatform] = None) -> None:
         cmd = self._docker_cmd()
+        docker_image = self.registry_resolver_strategy.resolve(docker_image)
         cmd += ["pull", docker_image]
         if platform:
             cmd += ["--platform", platform]
@@ -518,6 +519,7 @@ def inspect_image(
         pull: bool = True,
         strip_wellknown_repo_prefixes: bool = True,
     ) -> Dict[str, Union[dict, list, str]]:
+        image_name = self.registry_resolver_strategy.resolve(image_name)
         try:
             result = self._inspect_object(image_name)
             if strip_wellknown_repo_prefixes:
@@ -656,6 +658,7 @@ def has_docker(self) -> bool:
             return False
 
     def create_container(self, image_name: str, **kwargs) -> str:
+        image_name = self.registry_resolver_strategy.resolve(image_name)
         cmd, env_file = self._build_run_create_cmd("create", image_name, **kwargs)
         LOG.debug("Create container with cmd: %s", cmd)
         try:
@@ -674,6 +677,7 @@ def create_container(self, image_name: str, **kwargs) -> str:
             Util.rm_env_vars_file(env_file)
 
     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)
         try:
diff --git a/localstack-core/localstack/utils/container_utils/docker_sdk_client.py b/localstack-core/localstack/utils/container_utils/docker_sdk_client.py
@@ -59,7 +59,6 @@ class SdkDockerClient(ContainerClient):
     docker_client: Optional[DockerClient]
 
     def __init__(self):
-        super().__init__()
         try:
             self.docker_client = self._create_client()
             logging.getLogger("urllib3").setLevel(logging.INFO)
@@ -468,6 +467,7 @@ def inspect_image(
         pull: bool = True,
         strip_wellknown_repo_prefixes: bool = True,
     ) -> Dict[str, Union[dict, list, str]]:
+        image_name = self.registry_resolver_strategy.resolve(image_name)
         try:
             result = self.client().images.get(image_name).attrs
             if strip_wellknown_repo_prefixes:
