fix: repair GeoIP CI detection and harden httpbin startup in integration tests

This commit is contained in:
GitHub Actions
2026-03-13 19:29:52 +00:00
parent 98a4efcd82
commit bad97102e1
9 changed files with 178 additions and 126 deletions

View File

@@ -170,6 +170,7 @@ if ! docker network inspect containers_default >/dev/null 2>&1; then
fi
log_info "Starting httpbin backend container..."
docker pull kennethreitz/httpbin 2>/dev/null || true
docker run -d --name ${BACKEND_CONTAINER} --network containers_default kennethreitz/httpbin
log_info "Starting Charon container with ALL Cerberus features enabled..."
@@ -210,12 +211,12 @@ done
echo ""
log_info "Waiting for httpbin backend to be ready..."
for i in {1..20}; do
for i in {1..45}; do
if docker exec ${CONTAINER_NAME} sh -c "curl -sf http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
log_info "httpbin backend is ready"
break
fi
if [ $i -eq 20 ]; then
if [ $i -eq 45 ]; then
log_error "httpbin backend failed to start"
exit 1
fi

View File

@@ -183,15 +183,16 @@ done
# ============================================================================
echo ""
echo "Creating backend container for proxy host..."
docker pull kennethreitz/httpbin 2>/dev/null || true
docker run -d --name ${BACKEND_CONTAINER} --network containers_default kennethreitz/httpbin
echo "Waiting for httpbin backend to be ready..."
for i in {1..20}; do
for i in {1..45}; do
if docker exec ${CONTAINER_NAME} sh -c "curl -sf http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
echo "✓ httpbin backend is ready"
break
fi
if [ $i -eq 20 ]; then
if [ $i -eq 45 ]; then
echo "✗ httpbin backend failed to start"
exit 1
fi

View File

@@ -163,6 +163,7 @@ if ! docker network inspect containers_default >/dev/null 2>&1; then
fi
log_info "Starting httpbin backend container..."
docker pull kennethreitz/httpbin 2>/dev/null || true
docker run -d --name ${BACKEND_CONTAINER} --network containers_default kennethreitz/httpbin
log_info "Starting Charon container with Cerberus enabled..."
@@ -201,12 +202,12 @@ done
echo ""
log_info "Waiting for httpbin backend to be ready..."
for i in {1..20}; do
for i in {1..45}; do
if docker exec ${CONTAINER_NAME} sh -c "curl -sf http://${BACKEND_CONTAINER}/get" >/dev/null 2>&1; then
log_info "httpbin backend is ready"
break
fi
if [ $i -eq 20 ]; then
if [ $i -eq 45 ]; then
log_error "httpbin backend failed to start"
exit 1
fi