Implement policy option for images.pull

Fixes: containers#564

Signed-off-by: Nicola Sella <[email protected]>

Author: inknos

podman/domain/containers_run.py

@@ -44,7 +44,10 @@ def run(
                 side. Default: False.
 
         Keyword Args:
-            - See the create() method for keyword arguments.
+            - These args are directly used to pull an image when the image is not found
+              platform (str) – Platform in the format os[/arch[/variant]]
+              policy (str) - Pull policy. "missing" (default), "always", "never", "newer"
+            - See the create() method for other keyword arguments.
 
         Returns:
             - When detach is True, return a Container
@@ -66,7 +69,11 @@ def run(
         try:
             container = self.create(image=image, command=command, **kwargs)
         except ImageNotFound:
-            self.podman_client.images.pull(image, platform=kwargs.get("platform"))
+            self.podman_client.images.pull(
+                image,
+                platform=kwargs.get("platform"),
+                policy=kwargs.get("policy", "missing"),
+            )
             container = self.create(image=image, command=command, **kwargs)
 
         container.start()

podman/domain/images_manager.py

@@ -337,6 +337,7 @@ def pull(
             decode (bool) – Decode the JSON data from the server into dicts.
                 Only applies with ``stream=True``
             platform (str) – Platform in the format os[/arch[/variant]]
+            policy (str) - Pull policy. "always" (default), "missing", "never", "newer"
             progress_bar (bool) - Display a progress bar with the image pull progress (uses
                 the compat endpoint). Default: False
             tls_verify (bool) - Require TLS verification. Default: True.
@@ -365,6 +366,7 @@ def pull(
         }
 
         params = {
+            "policy": kwargs.get("policy", "always"),
             "reference": repository,
             "tlsVerify": kwargs.get("tls_verify", True),
             "compatMode": kwargs.get("compatMode", True),

podman/tests/unit/test_imagesmanager.py

@@ -649,6 +649,27 @@ def test_pull_2x(self, mock):
             images[1].id, "c4b16966ecd94ffa910eab4e630e24f259bf34a87e924cd4b1434f267b0e354e"
         )
 
+    @requests_mock.Mocker()
+    def test_pull_policy(self, mock):
+        image_id = "sha256:326dd9d7add24646a325e8eaa82125294027db2332e49c5828d96312c5d773ab"
+        mock.post(
+            tests.LIBPOD_URL + "/images/pull?reference=quay.io%2ffedora%3Alatest&policy=missing",
+            json={
+                "error": "",
+                "id": image_id,
+                "images": [image_id],
+                "stream": "",
+            },
+        )
+        mock.get(
+            tests.LIBPOD_URL + "/images"
+            "/sha256%3A326dd9d7add24646a325e8eaa82125294027db2332e49c5828d96312c5d773ab/json",
+            json=FIRST_IMAGE,
+        )
+
+        image = self.client.images.pull("quay.io/fedora:latest", policy="missing")
+        self.assertEqual(image.id, image_id)
+
     @requests_mock.Mocker()
     def test_list_with_name_parameter(self, mock):
         """Test that name parameter is correctly converted to a reference filter"""