ref: retry on 500s in docker pulls

getsentry · Jan 25, 2023 · c62b7e3 · c62b7e3
1 parent 9a67a00
commit c62b7e3
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/sentry/runner/commands/devservices.py b/src/sentry/runner/commands/devservices.py
@@ -89,7 +89,7 @@ def get_or_create(
 
 
 def retryable_pull(client: docker.DockerClient, image: str, max_attempts: int = 5) -> None:
-    from docker.errors import ImageNotFound
+    from docker.errors import APIError
 
     current_attempt = 0
 
@@ -100,12 +100,13 @@ def retryable_pull(client: docker.DockerClient, image: str, max_attempts: int =
     while True:
         try:
             client.images.pull(image)
-        except ImageNotFound as e:
+        except APIError:
             if current_attempt + 1 >= max_attempts:
-                raise e
+                raise
             current_attempt = current_attempt + 1
             continue
-        break
+        else:
+            break
 
 
 def ensure_interface(ports: dict[str, int | tuple[str, int]]) -> dict[str, tuple[str, int]]: