From f9653f599e75dfcef56b045fcc4dcb9c4febd5d5 Mon Sep 17 00:00:00 2001
From: Oleksandr Oliinyk <oleksandr.oliinyk@nordsec.com>
Date: Thu, 30 Jan 2025 10:10:25 +0100
Subject: [PATCH] Print out docker compose logs on failure

---
 .unreleased/get_docker_compose_log_on_failure |  0
 nat-lab/docker-compose.yml                    |  4 ++++
 nat-lab/natlab.py                             | 15 +++++++++------
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 .unreleased/get_docker_compose_log_on_failure

diff --git a/.unreleased/get_docker_compose_log_on_failure b/.unreleased/get_docker_compose_log_on_failure
new file mode 100644
index 000000000..e69de29bb
diff --git a/nat-lab/docker-compose.yml b/nat-lab/docker-compose.yml
index cda70c6bf..24a73805a 100644
--- 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
index 13e644695..c3fd21275 100755
--- 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():