fix arch mismatch?

Author: sean-breen

tests/scripts/check_container_packages.py

@@ -59,29 +59,18 @@
             cmd = systems[image["system"]]["cmd"]
             tag = f"{args.tag}{image['tag_suffix']}"
             full_tag = f"{image['image']}:{tag}"
+            logger.debug(f"Pulling image {full_tag} for platform {platform}")
             try:
-                i = client.images.get(full_tag)
-                ## check if the image is for the correct platform
-                image_platform = f"{i.attrs.get('Os', '')}/{i.attrs.get('Architecture', '')}"
-                if platform != image_platform:
-                    raise docker.errors.ImageNotFound(
-                        f"Image {full_tag} is not for platform {platform}, found {image_platform}"
-                    )
-            except docker.errors.ImageNotFound:
-                ## pull the image
-                logger.debug(f"Pulling image {full_tag} for platform {platform}")
-                try:
-                    client.images.remove(full_tag, force=True)
-                except Exception:
-                    pass
-                i = client.images.pull(repository=image_name, tag=tag, platform=platform)
-                logger.debug(f"Image {i.id} pulled successfully")
+                client.api.pull(repository=image_name, tag=tag, platform=platform)
+                logger.debug(f"Image {full_tag} for platform {platform} pulled successfully")
+            except Exception as e:
+                logger.debug(f"Pull attempt error: {e}")
             for package in image["packages"]:
                 command = f"{cmd} {package['name']}"
                 output = ""
                 try:
                     output = client.containers.run(
-                        i.id,
+                        full_tag,
                         command,
                         entrypoint="",
                         platform=platform,
@@ -91,7 +80,7 @@
                 except (docker.errors.ContainerError, docker.errors.NotFound) as e:
                     logger.debug(f"{e}, retrying")
                     output = client.containers.run(
-                        i.id,
+                        full_tag,
                         command,
                         entrypoint="",
                         platform=platform,