diff --git a/.env.example b/.env.example index f7a9c0c4..6ae991c0 100644 --- a/.env.example +++ b/.env.example @@ -31,6 +31,6 @@ CORE_DB_PASSWORD=postgres # ----- Frontend ----- NODE_ENV=development -PUBLIC_API_URL=http://localhost:8000 +PUBLIC_API_URL=http://localhost:8000/api PUBLIC_KEYCLOAK_REALM=master PUBLIC_KEYCLOAK_URL=http://localhost:8080 diff --git a/docker-compose.yml b/docker-compose.yml index 22afde48..47218aca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: entrypoint: ["/entrypoint.sh"] command: ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload", "--log-level", "info"] healthcheck: - test: ["CMD-SHELL", "curl -f http://localhost:8000/health || exit 1"] + test: ["CMD-SHELL", "curl -f http://localhost:8000/api/health || exit 1"] interval: 15s timeout: 5s retries: 5 diff --git a/scripts/frontend-entrypoint.sh b/scripts/frontend-entrypoint.sh index 3a490a70..5b0da3ef 100755 --- a/scripts/frontend-entrypoint.sh +++ b/scripts/frontend-entrypoint.sh @@ -33,7 +33,7 @@ wait_for_backend() { # Esperar al backend # En Docker, usamos el nombre del servicio. En desarrollo local, PUBLIC_API_URL apunta a localhost -BACKEND_HEALTH_URL="${BACKEND_INTERNAL_URL:-http://backend:8000}" +BACKEND_HEALTH_URL="${BACKEND_INTERNAL_URL:-http://backend:8000/api}" wait_for_backend "${BACKEND_HEALTH_URL}" echo "==========================================" diff --git a/scripts/health-check.sh b/scripts/health-check.sh index 40bd0d27..fd8b7d4c 100755 --- a/scripts/health-check.sh +++ b/scripts/health-check.sh @@ -146,7 +146,7 @@ echo "" check_service "Keycloak" "anexo76-keycloak" "http://localhost:8080/" || services_ok=false echo "" -check_service "Backend" "anexo76-backend" "http://localhost:8000/health" || services_ok=false +check_service "Backend" "anexo76-backend" "http://localhost:8000/api/health" || services_ok=false echo "" check_service "Frontend" "anexo76-frontend" "http://localhost:5173" || services_ok=false @@ -167,8 +167,8 @@ if [ "$services_ok" = true ]; then echo "" echo "URLs de acceso:" echo -e " ${GREEN}•${NC} Frontend: ${BLUE}http://localhost:5173${NC}" - echo -e " ${GREEN}•${NC} Backend: ${BLUE}http://localhost:8000${NC}" - echo -e " ${GREEN}•${NC} API Docs: ${BLUE}http://localhost:8000/docs${NC}" + echo -e " ${GREEN}•${NC} Backend: ${BLUE}http://localhost:8000/api${NC}" + echo -e " ${GREEN}•${NC} API Docs: ${BLUE}http://localhost:8000/api/docs${NC}" echo -e " ${GREEN}•${NC} Keycloak: ${BLUE}http://localhost:8080${NC}" echo "" exit 0 diff --git a/start.sh b/start.sh index 2dae3050..bae90b4f 100755 --- a/start.sh +++ b/start.sh @@ -80,7 +80,7 @@ KEYCLOAK_FRONTEND_CLIENT_ID=anexo76-frontend DEBUG=True ENVIRONMENT=development NODE_ENV=development -PUBLIC_API_URL=http://localhost:8000 +PUBLIC_API_URL=http://localhost:8000/api PUBLIC_KEYCLOAK_URL=http://localhost:8080 EOF echo -e "${GREEN}✓ Archivo .env creado con valores por defecto${NC}" @@ -156,8 +156,8 @@ echo "=========================================" echo "" echo "Servicios disponibles:" echo -e " ${GREEN}•${NC} Frontend: ${BLUE}http://localhost:5180${NC}" -echo -e " ${GREEN}•${NC} Backend: ${BLUE}http://localhost:8000${NC}" -echo -e " ${GREEN}•${NC} API Docs: ${BLUE}http://localhost:8000/docs${NC}" +echo -e " ${GREEN}•${NC} Backend: ${BLUE}http://localhost:8000/api${NC}" +echo -e " ${GREEN}•${NC} API Docs: ${BLUE}http://localhost:8000/api/docs${NC}" echo -e " ${GREEN}•${NC} Keycloak: ${BLUE}http://localhost:8080${NC}" echo "" echo "Credenciales de Keycloak Admin:"