Skip to content

Commit 9004478

Browse files
committed
chore: address review comments
1 parent 10309e4 commit 9004478

2 files changed

Lines changed: 4 additions & 31 deletions

File tree

.github/workflows/docker-compose-integration.yml

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,8 @@ jobs:
2323

2424
- name: Wait for services to be healthy
2525
run: |
26-
echo "Waiting for all services to be healthy..."
27-
# Wait for services with health checks to be healthy (7 services) and all services to be up
28-
# Increased timeout to 10 minutes for CI environment
29-
timeout 600 bash -c 'while true; do
30-
echo "=== Detailed Service Status ==="
31-
docker compose ps --format "table {{.Name}}\t{{.Status}}\t{{.Health}}"
32-
echo "=== Unhealthy Services ==="
33-
unhealthy_services=$(docker compose ps --format "{{.Name}} {{.Health}}" | grep -v healthy | grep -v "^[[:space:]]*$" || echo "")
34-
if [ -n "$unhealthy_services" ]; then
35-
echo "$unhealthy_services"
36-
echo "=== Logs for unhealthy services ==="
37-
for service in $(echo "$unhealthy_services" | awk "{print \$1}"); do
38-
echo "--- Logs for $service ---"
39-
docker compose logs --tail=10 "$service" || echo "No logs for $service"
40-
done
41-
else
42-
echo "All services healthy or no health check"
43-
fi
44-
healthy_count=$(docker compose ps --format "{{.Health}}" | grep -c "healthy" || echo "0")
45-
up_count=$(docker compose ps --format "{{.Status}}" | grep -c "Up" || echo "0")
46-
echo "Progress: $healthy_count/7 healthy, $up_count services up"
47-
if [ "$healthy_count" -ge 7 ] && [ "$up_count" -ge 7 ]; then
48-
echo "All services are healthy!"
49-
break
50-
fi
51-
sleep 10
52-
done'
26+
echo Pausing for 60s to allow services to start
27+
sleep 60
5328
docker compose ps
5429
5530
- name: Test dashboard endpoints
@@ -61,8 +36,7 @@ jobs:
6136
run: |
6237
# Test sticker award API with sample user data
6338
curl -f -X GET "http://localhost:8080/api/award/v1/users/user-001/stickers" || exit 1
64-
# TODO!
65-
# curl -f -X GET "http://localhost:8080/api/users/v1/health" || exit 1
39+
curl -f -X GET "http://localhost:8080/api/users/v1/health" || exit 1
6640
6741
- name: Show service logs on failure
6842
if: failure()

user-management/src/Stickerlandia.UserManagement.Api/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ COPY . ./
1212
# Publish the application
1313
RUN dotnet publish src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj -o out -c Release
1414

15-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
16-
RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
15+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled AS runtime
1716
WORKDIR /App
1817
COPY --from=build /App/out .
1918
EXPOSE 80

0 commit comments

Comments
 (0)