More fixes

Author: atgreen

.github/workflows/build.yml

@@ -93,18 +93,42 @@ jobs:
             --format '{{ (index .NetworkSettings.Networks "ci_default").IPAddress }}' \
             ci_rlgl-server_1)
 
+          podman logs --follow ci_rlgl-server_1 &
+          LOG_PID=$!
+
           if [ -z "$CONTAINER_IP" ]; then
-            echo "ERROR: Container has no IP address"
+             echo "ERROR: Container has no IP address"
+             podman container inspect ci_rlgl-server_1
+             exit 1
+          fi
+          echo "Container IP: $CONTAINER_IP"
+
+          # Check if container is running
+          if ! podman container exists ci_rlgl-server_1; then
+            echo "ERROR: Container doesn't exist"
             exit 1
           fi
 
-          echo "Container IP: $CONTAINER_IP"
+          CONTAINER_STATUS=$(podman container inspect --format '{{.State.Status}}' ci_rlgl-server_1)
+          echo "Container status: $CONTAINER_STATUS"
+
+          if [ "$CONTAINER_STATUS" != "running" ]; then
+            echo "ERROR: Container is not running"
+            podman logs ci_rlgl-server_1
+            exit 1
+          fi
+
+          # Wait for service with better logging
+          echo "Waiting for service to be ready..."
+          WAIT_COUNT=0
+          if timeout -s TERM 120 bash -c \
+            'while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' ${0})" != "200" ]]; do
+               echo "Attempt $((++WAIT_COUNT)): Waiting for ${0}"
+               sleep 5
+             done' http://$CONTAINER_IP:8080/healthz ; then
 
-          # Wait for service to be ready
-          if timeout -s TERM 45 bash -c \
-             'while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' ${0})" != "200" ]];\
-                  do echo "Waiting for ${0}" && sleep 2;\
-                    done' http://$CONTAINER_IP:8080/healthz ; then
+             echo "Service is ready!"
+             sleep 5  # Extra safety margin
 
             # Setup test environment in` container
             podman exec -t -e IP="$CONTAINER_IP" ci_rlgl-server_1 \
@@ -117,13 +141,15 @@ jobs:
             ./.ci/test.sh "$CONTAINER_IP:8080" || TEST_FAILED=true
 
             # Always show logs
+            kill $LOG_PID 2>/dev/null || true
             podman logs ci_rlgl-server_1
 
             if [ "$TEST_FAILED" = "true" ]; then
               exit 1
             fi
           else
             echo "ERROR: Service failed to start within timeout"
+            kill $LOG_PID 2>/dev/null || true
             podman logs ci_rlgl-server_1
             exit 1
           fi