From 0b4ca661aa3c06829af73c00e900c790fd4b2a55 Mon Sep 17 00:00:00 2001
From: Scott Gerring <scott@scottgerring.com>
Date: Thu, 12 Jun 2025 15:46:38 +0200
Subject: [PATCH] chore: make health checks healthier

---
 .../workflows/docker-compose-integration.yml  | 23 ++++++++-----------
 docker-compose.yml                            |  5 ++++
 .../Dockerfile                                |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/docker-compose-integration.yml b/.github/workflows/docker-compose-integration.yml
index 765633a0..527606e7 100644
--- a/.github/workflows/docker-compose-integration.yml
+++ b/.github/workflows/docker-compose-integration.yml
@@ -23,9 +23,8 @@ jobs:
       
     - name: Wait for services to be healthy
       run: |
-        echo "Waiting for all services to be healthy..."
-        # Wait for services with health checks to be healthy (4 services) and all services to be up
-        timeout 300 bash -c 'until [ $(docker compose ps --format "{{.Health}}" | grep -c "healthy") -ge 4 ] && [ $(docker compose ps --format "{{.Status}}" | grep -c "Up") -ge 5 ]; do sleep 5; done'
+        echo Pausing for 60s to allow services to start
+        sleep 60
         docker compose ps
       
     - name: Test dashboard endpoints
@@ -37,23 +36,19 @@ jobs:
       run: |
         # Test sticker award API with sample user data
         curl -f -X GET "http://localhost:8080/api/award/v1/users/user-001/stickers" || exit 1
-        # TODO!
-        # curl -f -X GET "http://localhost:8080/api/users/v1/health" || exit 1
+        curl -f -X GET "http://localhost:8080/api/users/v1/health" || exit 1
       
     - name: Show service logs on failure
       if: failure()
       run: |
         echo "=== Docker Compose Services Status ==="
         docker compose ps
-        echo "=== Traefik Logs ==="
-        docker compose logs traefik
-        echo "=== Sticker Award Logs ==="
-        docker compose logs sticker-award
-        echo "=== User Management Logs ==="
-        docker compose logs user-management
-        echo "=== Database Logs ==="
-        docker compose logs sticker-award-db
-        docker compose logs user-management-db
+        echo "=== All Service Logs ==="
+        docker compose logs --tail=50
+        echo "=== Health Check Details ==="
+        docker compose ps --format "table {{.Name}}\t{{.Status}}\t{{.Health}}"
+        echo "=== Resource Usage ==="
+        docker stats --no-stream
       
     - name: Cleanup
       if: always()
diff --git a/docker-compose.yml b/docker-compose.yml
index c81b0f0f..e944d032 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -185,6 +185,11 @@ services:
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: minioadmin
       QUARKUS_S3_PATH_STYLE_ACCESS: "true"
       STICKER_IMAGES_BUCKET: sticker-images
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.sticker-award.rule=PathPrefix(`/api/award`)"
diff --git a/user-management/src/Stickerlandia.UserManagement.Api/Dockerfile b/user-management/src/Stickerlandia.UserManagement.Api/Dockerfile
index 84bc3114..1d4050e1 100644
--- a/user-management/src/Stickerlandia.UserManagement.Api/Dockerfile
+++ b/user-management/src/Stickerlandia.UserManagement.Api/Dockerfile
@@ -10,7 +10,7 @@ RUN dotnet restore src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManage
 COPY . ./
 
 # Publish the application
-RUN dotnet publish src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj -o out -c Release -r linux-arm64
+RUN dotnet publish src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj -o out -c Release
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled AS runtime
 WORKDIR /App