Merge pull request #408 from milanbalazs/main

Fix the locally non-existent image fails with AttributeError

podman/client.py

@@ -138,7 +138,7 @@ def from_env(
     @cached_property
     def containers(self) -> ContainersManager:
         """Returns Manager for operations on containers stored by a Podman service."""
-        return ContainersManager(client=self.api)
+        return ContainersManager(client=self.api, podman_client=self)
 
     @cached_property
     def images(self) -> ImagesManager:

podman/domain/containers_manager.py

@@ -30,7 +30,7 @@ def get(self, key: str) -> Container:
         """Get container by name or id.
 
         Args:
-            container_id: Container name or id.
+            key: Container name or id.
 
         Returns:
             A `Container` object corresponding to `key`.

podman/domain/containers_run.py

@@ -60,7 +60,7 @@ def run(
         try:
             container = self.create(image=image, command=command, **kwargs)
         except ImageNotFound:
-            self.client.images.pull(image, platform=kwargs.get("platform"))
+            self.podman_client.images.pull(image, platform=kwargs.get("platform"))
             container = self.create(image=image, command=command, **kwargs)
 
         container.start()

podman/domain/images_manager.py

@@ -309,7 +309,8 @@ def pull(
         else:
             params["reference"] = f"{repository}:{tag}"
 
-        if "platform" in kwargs:
+        # Check if "platform" in kwargs AND it has value.
+        if "platform" in kwargs and kwargs["platform"]:
             tokens = kwargs.get("platform").split("/")
             if 1 < len(tokens) > 3:
                 raise ValueError(f'\'{kwargs.get("platform")}\' is not a legal platform.')

podman/domain/manager.py

@@ -22,17 +22,20 @@ def __init__(
         attrs: Optional[Mapping[str, Any]] = None,
         client: Optional[APIClient] = None,
         collection: Optional["Manager"] = None,
+        podman_client: Optional["PodmanClient"] = None,
     ):
         """Initialize base class for PodmanResource's.
 
         Args:
             attrs: Mapping of attributes for resource from Podman service.
             client: Configured connection to a Podman service.
             collection: Manager of this category of resource, named `collection` for compatibility
+            podman_client: PodmanClient() configured to connect to Podman object.
         """
         super().__init__()
         self.client = client
         self.manager = collection
+        self.podman_client = podman_client
 
         self.attrs = {}
         if attrs is not None:
@@ -77,14 +80,18 @@ class Manager(ABC):
     def resource(self):
         """Type[PodmanResource]: Class which the factory method prepare_model() will use."""
 
-    def __init__(self, client: APIClient = None) -> None:
+    def __init__(
+        self, client: Optional[APIClient] = None, podman_client: Optional["PodmanClient"] = None
+    ) -> None:
         """Initialize Manager() object.
 
         Args:
             client: APIClient() configured to connect to Podman service.
+            podman_client: PodmanClient() configured to connect to Podman object.
         """
         super().__init__()
         self.client = client
+        self.podman_client = podman_client
 
     @abstractmethod
     def exists(self, key: str) -> bool:
@@ -110,14 +117,17 @@ def prepare_model(self, attrs: Union[PodmanResource, Mapping[str, Any]]) -> Podm
         # Refresh existing PodmanResource.
         if isinstance(attrs, PodmanResource):
             attrs.client = self.client
+            attrs.podman_client = self.podman_client
             attrs.collection = self
             return attrs
 
         # Instantiate new PodmanResource from Mapping[str, Any]
         if isinstance(attrs, abc.Mapping):
             # TODO Determine why pylint is reporting typing.Type not callable
             # pylint: disable=not-callable
-            return self.resource(attrs=attrs, client=self.client, collection=self)
+            return self.resource(
+                attrs=attrs, client=self.client, podman_client=self.podman_client, collection=self
+            )
 
         # pylint: disable=broad-exception-raised
         raise Exception(f"Can't create {self.resource.__name__} from {attrs}")