Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions .github/workflows/ci-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
smoke:
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
matrix:
port: [8080, 8090]
steps:
- uses: actions/checkout@v4

Expand All @@ -36,8 +39,9 @@ jobs:

- name: Start container
run: |
docker run -d --name smoke-test \
-p 18080:8080 \
docker run -d --name smoke-test-${{ matrix.port }} \
-p ${{ matrix.port }}:${{ matrix.port }} \
-e PORT=${{ matrix.port }} \
-e NODE_ENV=production \
codex-proxy:smoke
echo "Container started"
Expand All @@ -46,7 +50,7 @@ jobs:
run: |
echo "Waiting for container to become healthy..."
for i in $(seq 1 30); do
STATUS=$(docker inspect --format='{{.State.Health.Status}}' smoke-test 2>/dev/null || echo "starting")
STATUS=$(docker inspect --format='{{.State.Health.Status}}' smoke-test-${{ matrix.port }} 2>/dev/null || echo "starting")
echo " [$i/30] status: $STATUS"
if [ "$STATUS" = "healthy" ]; then
echo "Container is healthy"
Expand All @@ -55,19 +59,19 @@ jobs:
sleep 2
done
echo "::error::Container did not become healthy within 60s"
docker logs smoke-test
docker logs smoke-test-${{ matrix.port }}
exit 1

- name: Verify /health endpoint
run: |
RESPONSE=$(curl -sf http://localhost:18080/health)
RESPONSE=$(curl -sf http://localhost:${{ matrix.port }}/health)
echo "Response: $RESPONSE"
echo "$RESPONSE" | jq -e '.status == "ok"'

- name: Verify /v1/models returns valid JSON
run: |
# Without auth, should return 401 or model list — either way must be valid JSON
STATUS=$(curl -s -o /dev/null -w '%{http_code}' http://localhost:18080/v1/models)
STATUS=$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${{ matrix.port }}/v1/models)
echo "/v1/models status: $STATUS"
# 200 (no key set) or 401 (key set) are both acceptable
if [ "$STATUS" != "200" ] && [ "$STATUS" != "401" ]; then
Expand All @@ -78,5 +82,5 @@ jobs:
- name: Cleanup
if: always()
run: |
docker logs smoke-test 2>&1 | tail -30
docker rm -f smoke-test || true
docker logs smoke-test-${{ matrix.port }} 2>&1 | tail -30
docker rm -f smoke-test-${{ matrix.port }} || true
22 changes: 19 additions & 3 deletions docker-healthcheck.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#!/bin/sh
# Read server port from config, fallback to 8080
PORT=$(grep -A5 '^server:' /app/config/default.yaml 2>/dev/null | grep 'port:' | head -1 | awk '{print $2}')
curl -fs "http://localhost:${PORT:-8080}/health" || exit 1

RESOLVED_PORT=""
if [ -n "$PORT" ]; then
RESOLVED_PORT="$PORT"
fi

if [ -z "$RESOLVED_PORT" ] && [ -f /app/data/local.yaml ]; then
RESOLVED_PORT=$(grep -A5 '^server:' /app/data/local.yaml 2>/dev/null | grep 'port:' | head -1 | awk '{print $2}')
fi

if [ -z "$RESOLVED_PORT" ] && [ -f /app/config/default.yaml ]; then
RESOLVED_PORT=$(grep -A5 '^server:' /app/config/default.yaml 2>/dev/null | grep 'port:' | head -1 | awk '{print $2}')
fi

if [ -z "$RESOLVED_PORT" ]; then
RESOLVED_PORT=8080
fi

curl -fs "http://localhost:${RESOLVED_PORT}/health" || exit 1
Loading