Print out docker compose logs on failure

NordSecurity · Jan 30, 2025 · 8b2a65a · 8b2a65a
1 parent d05c5b4
commit 8b2a65a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.unreleased/get_docker_compose_log_on_failure b/.unreleased/get_docker_compose_log_on_failure
diff --git a/nat-lab/docker-compose.yml b/nat-lab/docker-compose.yml
@@ -629,6 +629,10 @@ services:
       PYTHONUNBUFFERED: 1
     healthcheck:
       test: "curl --cacert /etc/ssl/server_certificate/test.pem https://api.nordvpn.com/v1/health"
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 5s
     networks:
       internet:
         ipv4_address: 10.0.80.86

diff --git a/nat-lab/natlab.py b/nat-lab/natlab.py
@@ -52,12 +52,15 @@ def start():
             "LIBTELIO_ENV_NAT_LAB_DEPS_TAG": LIBTELIO_ENV_NAT_LAB_DEPS_TAG,
         },
     )
-    run_command(
-        ["docker", "compose", "up", "-d", "--wait"],
-        env={"COMPOSE_DOCKER_CLI_BUILD": "1", "DOCKER_BUILDKIT": "1"},
-    )
-
-    check_containers()
+    try:
+        run_command(
+            ["docker", "compose", "up", "-d", "--wait"],
+            env={"COMPOSE_DOCKER_CLI_BUILD": "1", "DOCKER_BUILDKIT": "1"},
+        )
+    except subprocess.CalledProcessError:
+        check_containers()
+    else:
+        check_containers()
 
 
 def stop():