Merge pull request 'fix: update API URL paths in environment and health check scripts' (#2) from development into main
Reviewed-on: ADUANASOFT/anexo76#2
This commit is contained in:
@@ -31,6 +31,6 @@ CORE_DB_PASSWORD=postgres
|
|||||||
|
|
||||||
# ----- Frontend -----
|
# ----- Frontend -----
|
||||||
NODE_ENV=development
|
NODE_ENV=development
|
||||||
PUBLIC_API_URL=http://localhost:8000
|
PUBLIC_API_URL=http://localhost:8000/api
|
||||||
PUBLIC_KEYCLOAK_REALM=master
|
PUBLIC_KEYCLOAK_REALM=master
|
||||||
PUBLIC_KEYCLOAK_URL=http://localhost:8080
|
PUBLIC_KEYCLOAK_URL=http://localhost:8080
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ services:
|
|||||||
entrypoint: ["/entrypoint.sh"]
|
entrypoint: ["/entrypoint.sh"]
|
||||||
command: ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload", "--log-level", "info"]
|
command: ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload", "--log-level", "info"]
|
||||||
healthcheck:
|
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
|
interval: 15s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ wait_for_backend() {
|
|||||||
|
|
||||||
# Esperar al backend
|
# Esperar al backend
|
||||||
# En Docker, usamos el nombre del servicio. En desarrollo local, PUBLIC_API_URL apunta a localhost
|
# 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}"
|
wait_for_backend "${BACKEND_HEALTH_URL}"
|
||||||
|
|
||||||
echo "=========================================="
|
echo "=========================================="
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ echo ""
|
|||||||
check_service "Keycloak" "anexo76-keycloak" "http://localhost:8080/" || services_ok=false
|
check_service "Keycloak" "anexo76-keycloak" "http://localhost:8080/" || services_ok=false
|
||||||
echo ""
|
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 ""
|
echo ""
|
||||||
|
|
||||||
check_service "Frontend" "anexo76-frontend" "http://localhost:5173" || services_ok=false
|
check_service "Frontend" "anexo76-frontend" "http://localhost:5173" || services_ok=false
|
||||||
@@ -167,8 +167,8 @@ if [ "$services_ok" = true ]; then
|
|||||||
echo ""
|
echo ""
|
||||||
echo "URLs de acceso:"
|
echo "URLs de acceso:"
|
||||||
echo -e " ${GREEN}•${NC} Frontend: ${BLUE}http://localhost:5173${NC}"
|
echo -e " ${GREEN}•${NC} Frontend: ${BLUE}http://localhost:5173${NC}"
|
||||||
echo -e " ${GREEN}•${NC} Backend: ${BLUE}http://localhost:8000${NC}"
|
echo -e " ${GREEN}•${NC} Backend: ${BLUE}http://localhost:8000/api${NC}"
|
||||||
echo -e " ${GREEN}•${NC} API Docs: ${BLUE}http://localhost:8000/docs${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 -e " ${GREEN}•${NC} Keycloak: ${BLUE}http://localhost:8080${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
6
start.sh
6
start.sh
@@ -80,7 +80,7 @@ KEYCLOAK_FRONTEND_CLIENT_ID=anexo76-frontend
|
|||||||
DEBUG=True
|
DEBUG=True
|
||||||
ENVIRONMENT=development
|
ENVIRONMENT=development
|
||||||
NODE_ENV=development
|
NODE_ENV=development
|
||||||
PUBLIC_API_URL=http://localhost:8000
|
PUBLIC_API_URL=http://localhost:8000/api
|
||||||
PUBLIC_KEYCLOAK_URL=http://localhost:8080
|
PUBLIC_KEYCLOAK_URL=http://localhost:8080
|
||||||
EOF
|
EOF
|
||||||
echo -e "${GREEN}✓ Archivo .env creado con valores por defecto${NC}"
|
echo -e "${GREEN}✓ Archivo .env creado con valores por defecto${NC}"
|
||||||
@@ -156,8 +156,8 @@ echo "========================================="
|
|||||||
echo ""
|
echo ""
|
||||||
echo "Servicios disponibles:"
|
echo "Servicios disponibles:"
|
||||||
echo -e " ${GREEN}•${NC} Frontend: ${BLUE}http://localhost:5180${NC}"
|
echo -e " ${GREEN}•${NC} Frontend: ${BLUE}http://localhost:5180${NC}"
|
||||||
echo -e " ${GREEN}•${NC} Backend: ${BLUE}http://localhost:8000${NC}"
|
echo -e " ${GREEN}•${NC} Backend: ${BLUE}http://localhost:8000/api${NC}"
|
||||||
echo -e " ${GREEN}•${NC} API Docs: ${BLUE}http://localhost:8000/docs${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 -e " ${GREEN}•${NC} Keycloak: ${BLUE}http://localhost:8080${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Credenciales de Keycloak Admin:"
|
echo "Credenciales de Keycloak Admin:"
|
||||||
|
|||||||
Reference in New Issue
Block a user