Merge pull request #8308 from jwhonce/jira/run-976

Refactor to use DockerClient vs APIClient

1 files changed, 13 insertions, 11 deletions

diff --git a/test/python/docker/common.py b/test/python/docker/common.py
index 2828d2d20..e79d64a9b 100644
--- a/test/python/docker/common.py
+++ b/test/python/docker/common.py
@@ -1,21 +1,23 @@
-from docker import APIClient
+from docker import DockerClient
 
 from test.python.docker import constant
 
 
-def run_top_container(client: APIClient):
-    c = client.create_container(
+def run_top_container(client: DockerClient):
+    c = client.containers.create(
         constant.ALPINE, command="top", detach=True, tty=True, name="top"
     )
-    client.start(c.get("Id"))
-    return c.get("Id")
+    c.start()
+    return c.id
 
 
-def remove_all_containers(client: APIClient):
-    for ctnr in client.containers(quiet=True):
-        client.remove_container(ctnr, force=True)
+def remove_all_containers(client: DockerClient):
+    for ctnr in client.containers.list(all=True):
+        ctnr.remove(force=True)
 
 
-def remove_all_images(client: APIClient):
-    for image in client.images(quiet=True):
-        client.remove_image(image, force=True)
+def remove_all_images(client: DockerClient):
+    for img in client.images.list():
+        # FIXME should DELETE /images accept the sha256: prefix?
+        id_ = img.id.removeprefix("sha256:")
+        client.images.remove(id_, force=True)