Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41e0501e6b | ||
|
|
f675b86dc8 | ||
|
|
8ed1b57f1d |
@@ -189,8 +189,17 @@ jobs:
|
||||
docker rm -f zeavis-web zeavis-api zeavis-ml zeavis-node-exporter 2>/dev/null || true
|
||||
docker compose pull
|
||||
docker compose up -d
|
||||
# Wait for containers to be healthy (up to 60s)
|
||||
wait_container() {
|
||||
local name=$1
|
||||
for i in $(seq 1 30); do
|
||||
docker compose ps | grep -q "${name}.*Up" && return 0
|
||||
sleep 2
|
||||
done
|
||||
return 1
|
||||
}
|
||||
wait_container zeavis-web || exit 1
|
||||
wait_container zeavis-api || exit 1
|
||||
wait_container zeavis-ml || exit 1
|
||||
wait_container zeavis-node-exporter || echo "⚠️ node_exporter not running (non-fatal)"
|
||||
docker compose ps
|
||||
docker compose ps | grep -q "zeavis-web.*Up" || exit 1
|
||||
docker compose ps | grep -q "zeavis-api.*Up" || exit 1
|
||||
docker compose ps | grep -q "zeavis-ml.*Up" || exit 1
|
||||
docker compose ps | grep -q "zeavis-node-exporter.*Up" || echo "⚠️ node_exporter not running (non-fatal)"
|
||||
|
||||
@@ -8,6 +8,12 @@ const googleOAuthEnabled = Boolean(
|
||||
);
|
||||
|
||||
const webAppUrl = Bun.env.WEB_APP_URL ?? 'http://localhost:5173';
|
||||
const allowedOrigins = [
|
||||
webAppUrl,
|
||||
'https://tauri.localhost',
|
||||
'tauri://localhost',
|
||||
'http://localhost:5173',
|
||||
];
|
||||
const secureCookies = Bun.env.SECURE_COOKIES === 'true' || webAppUrl.startsWith('https://');
|
||||
|
||||
export const env = {
|
||||
@@ -24,6 +30,7 @@ export const env = {
|
||||
googleClientSecret: Bun.env.GOOGLE_CLIENT_SECRET,
|
||||
googleRedirectUri: Bun.env.GOOGLE_REDIRECT_URI,
|
||||
webAppUrl,
|
||||
allowedOrigins,
|
||||
secureCookies,
|
||||
};
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ assertRequiredEnv();
|
||||
|
||||
const app = new Elysia()
|
||||
.use(cors({
|
||||
origin: env.webAppUrl,
|
||||
origin: env.allowedOrigins,
|
||||
credentials: true,
|
||||
}))
|
||||
.use(metricsRoutes)
|
||||
|
||||
@@ -14,7 +14,7 @@ import type {
|
||||
} from '@zeavis/shared';
|
||||
import { recordApiCall } from './telemetry';
|
||||
|
||||
const apiBaseUrl = import.meta.env.VITE_API_BASE_URL ?? '';
|
||||
const apiBaseUrl = import.meta.env.VITE_API_BASE_URL ?? 'https://zeavisedu.asepharyana.my.id';
|
||||
|
||||
export interface ApiError extends Error {
|
||||
status: number;
|
||||
|
||||
@@ -38,8 +38,6 @@ services:
|
||||
API_PORT: "3000"
|
||||
WEB_APP_URL: https://zeavisedu.asepharyana.my.id
|
||||
ML_SERVICE_URL: ${ML_SERVICE_URL:-http://zeavis-ml:8000}
|
||||
ports:
|
||||
- "3000:3000"
|
||||
labels:
|
||||
traefik.enable: "true"
|
||||
traefik.http.routers.zeavis-api.rule: Host(`api-zeavisedu.asepharyana.my.id`)
|
||||
@@ -53,8 +51,6 @@ services:
|
||||
image: prom/node-exporter:v1.8.2
|
||||
container_name: zeavis-node-exporter
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "9100:9100"
|
||||
command:
|
||||
- "--path.rootfs=/host"
|
||||
- "--web.listen-address=:9100"
|
||||
@@ -77,8 +73,6 @@ services:
|
||||
environment:
|
||||
MODEL_PATH: /app/model/model.onnx
|
||||
MODEL_INPUT_SIZE: "224"
|
||||
ports:
|
||||
- "8000:8000"
|
||||
labels:
|
||||
traefik.enable: "true"
|
||||
traefik.http.routers.zeavis-ml.rule: Host(`ml-zeavisedu.asepharyana.my.id`)
|
||||
|
||||
Reference in New Issue
Block a user