go back to getting matching containers by name

getsentry · Dec 18, 2024 · 08b2e2f · 08b2e2f
1 parent 72d520b
commit 08b2e2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/devservices/utils/docker.py b/devservices/utils/docker.py
@@ -78,7 +78,7 @@ def wait_for_healthy(container_name: str, status: Status) -> None:
 
 def get_matching_containers(label: str) -> list[str]:
     """
-    Returns a list of container IDs with the given label
+    Returns a list of container names with the given label
     """
     check_docker_daemon_running()
     try:
@@ -87,7 +87,8 @@ def get_matching_containers(label: str) -> list[str]:
                 [
                     "docker",
                     "ps",
-                    "-q",
+                    "--format",
+                    "{{.Names}}",
                     "--filter",
                     f"label={label}",
                 ],

diff --git a/tests/utils/test_docker.py b/tests/utils/test_docker.py
@@ -53,7 +53,8 @@ def test_get_matching_containers(
         [
             "docker",
             "ps",
-            "-q",
+            "--format",
+            "{{.Names}}",
             "--filter",
             f"label={DEVSERVICES_ORCHESTRATOR_LABEL}",
         ],
@@ -90,7 +91,8 @@ def test_get_matching_containers_error(
         [
             "docker",
             "ps",
-            "-q",
+            "--format",
+            "{{.Names}}",
             "--filter",
             f"label={DEVSERVICES_ORCHESTRATOR_LABEL}",
         ],