Fix container image detection for aarch64

agners · agners · commit b2d2ba67d22f · 2025-05-19T22:34:00.000+02:00
It seems that on newer Docker (e.g. 28.0.4) the container image built
on the local system on an 64-bit Arm systems returns the architecture
variant just like on 32-bit Arm (but v8 in this case). This is not
expected by the current code. To make Supervisor detect the image
correctly on new and old Docker versions, use substring matching.
diff --git a/supervisor/docker/interface.py b/supervisor/docker/interface.py
@@ -478,8 +478,16 @@ async def check_image(
                 image_arch = f"{image_arch}/{image.attrs['Variant']}"
 
             # If we have an image and its the right arch, all set
-            if MAP_ARCH[expected_image_arch] == image_arch:
+            # It seems that newer Docker version return a variant for arm64 images.
+            # Make sure we match linux/arm64 and linux/arm64/v8.
+            if image_arch.startswith(MAP_ARCH[expected_image_arch]):
                 return
+            _LOGGER.info(
+                "Image %s has arch %s, expected %s. Reinstalling.",
+                image_name,
+                image_arch,
+                expected_image_arch,
+            )
 
         # We're missing the image we need. Stop and clean up what we have then pull the right one
         with suppress(DockerError):
