merica-dlh/merica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(setup): auto-detect host server IP in setup banner, support HEAD in /health, clean compose warning

Browse Source
This commit is contained in:
syahril
2026-10-21 18:03:41 +07:00
parent 870c533b5a
commit d28395a1d9
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/main.py
+3 -3
View File
@@ -48,7 +48,7 @@ app.include_router(api_v1_router)
app.include_router(legacy_router) app.include_router(legacy_router)
@app.get("/api/v1/health", tags=["System"], summary="System health check probe") @app.api_route("/api/v1/health", methods=["GET", "HEAD"], tags=["System"], summary="System health check probe")
def health_check(): def health_check():
"""Health check probe endpoint.""" """Health check probe endpoint."""
return { return {
@@ -58,8 +58,8 @@ def health_check():
} }
# Backward compatibility health check probes (hidden from OpenAPI schema) # Backward compatibility health check probes (hidden from OpenAPI schema)
@app.get("/health", include_in_schema=False) @app.api_route("/health", methods=["GET", "HEAD"], include_in_schema=False)
@app.get("/api/health", include_in_schema=False) @app.api_route("/api/health", methods=["GET", "HEAD"], include_in_schema=False)
def legacy_health_check(): def legacy_health_check():
return health_check() return health_check()
docker-compose.yml
-2
View File
@@ -9,8 +9,6 @@
# - Pre-seeded Starter Pipelines mounted to guarantee DAGs list appears instantly # - Pre-seeded Starter Pipelines mounted to guarantee DAGs list appears instantly
# ============================================================================== # ==============================================================================
version: "3.8"
services: services:
merica: merica:
build: . build: .
setup.sh
+13 -3
View File
@@ -55,7 +55,14 @@ MERICA_PORT=$(grep -E "^MERICA_PORT=" .env | cut -d '=' -f2 | tr -d ' ' || echo
MERICA_PORT=${MERICA_PORT:-14000} MERICA_PORT=${MERICA_PORT:-14000}
AIRFLOW_URL=$(grep -E "^AIRFLOW_WEB_URL=" .env | cut -d '=' -f2 | tr -d ' ' || echo "http://host.docker.internal:14080") AIRFLOW_URL=$(grep -E "^AIRFLOW_WEB_URL=" .env | cut -d '=' -f2 | tr -d ' ' || echo "http://host.docker.internal:14080")
# 3. Verifikasi Starter Seed Pipelines (Anti-Blank Canvas) # Deteksi IP Server Host untuk kenyamanan copy-paste
SERVER_IP=$(hostname -I 2>/dev/null | awk '{print $1}')
if [ -z "$SERVER_IP" ]; then
SERVER_IP=$(ip -4 route get 1.1.1.1 2>/dev/null | awk '{print $7}')
fi
SERVER_IP=${SERVER_IP:-localhost}
# 3. Verifikasi Starter Seed Pipelines
echo -e "📁 [3/5] Memverifikasi template starter pipelines..." echo -e "📁 [3/5] Memverifikasi template starter pipelines..."
if [ -d "./pipelines/configs" ] && [ "$(ls -A ./pipelines/configs 2>/dev/null)" ]; then if [ -d "./pipelines/configs" ] && [ "$(ls -A ./pipelines/configs 2>/dev/null)" ]; then
TOTAL_DAGS=$(ls -1 ./pipelines/configs/*.yaml 2>/dev/null | wc -l) TOTAL_DAGS=$(ls -1 ./pipelines/configs/*.yaml 2>/dev/null | wc -l)
@@ -90,12 +97,15 @@ if [ $SUCCESS -eq 1 ]; then
echo -e "\n${GREEN}==============================================================================${NC}" echo -e "\n${GREEN}==============================================================================${NC}"
echo -e "${GREEN}🎉 MERICA STANDALONE APPLIANCE BERHASIL AKTIF & SEHAT!${NC}" echo -e "${GREEN}🎉 MERICA STANDALONE APPLIANCE BERHASIL AKTIF & SEHAT!${NC}"
echo -e "${GREEN}==============================================================================${NC}" echo -e "${GREEN}==============================================================================${NC}"
echo -e "🌐 Antarmuka Web MERICA : ${BLUE}http://localhost:${MERICA_PORT}${NC}" echo -e "🌐 Antarmuka Web MERICA : ${GREEN}http://${SERVER_IP}:${MERICA_PORT}${NC}"
if [ "$SERVER_IP" != "localhost" ] && [ "$SERVER_IP" != "127.0.0.1" ]; then
echo -e " (Akses Lokal) : ${BLUE}http://localhost:${MERICA_PORT}${NC}"
fi
echo -e "🔗 Airflow Target : ${YELLOW}${AIRFLOW_URL}${NC}" echo -e "🔗 Airflow Target : ${YELLOW}${AIRFLOW_URL}${NC}"
echo -e "🔑 Kredensial Default : Username: ${GREEN}admin${NC} | Password: ${GREEN}admin${NC}" echo -e "🔑 Kredensial Default : Username: ${GREEN}admin${NC} | Password: ${GREEN}admin${NC}"
echo -e "📁 Direktori Pipeline : ./pipelines (Configs, Metadata, & dbt)" echo -e "📁 Direktori Pipeline : ./pipelines (Configs, Metadata, & dbt)"
echo -e "==============================================================================" echo -e "=============================================================================="
echo -e "💡 Tips: Buka browser Anda di ${BLUE}http://localhost:${MERICA_PORT}${NC} untuk mulai merancang DAG!" echo -e "💡 Tips: Buka browser Anda di ${GREEN}http://${SERVER_IP}:${MERICA_PORT}${NC} untuk mulai merancang DAG!"
echo -e " Untuk menghentikan: ${YELLOW}$COMPOSE_CMD down${NC}" echo -e " Untuk menghentikan: ${YELLOW}$COMPOSE_CMD down${NC}"
echo -e "==============================================================================\n" echo -e "==============================================================================\n"
else else