Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

fix: Python 3.10 tomllib fallback, alembic logging, and frontend compose healthcheck

Juan Denis4a02b5f3f622
diff --git a/backend/app/services/repository_manifest_service.py b/backend/app/services/repository_manifest_service.py
index c9a52155..4d005ea5 100644
--- a/backend/app/services/repository_manifest_service.py
+++ b/backend/app/services/repository_manifest_service.py
@@ -2,12 +2,16 @@
import json
import re
-import tomllib
from pathlib import Path
from typing import Any, Dict, List, Optional
import yaml
+try:
+ import tomllib # Python 3.11+
+except ModuleNotFoundError: # pragma: no cover
+ import tomli as tomllib
+
class RepositoryManifestService:
"""Detect deploy metadata from common PaaS and ServerKit manifest files."""
diff --git a/backend/migrations/alembic.ini b/backend/migrations/alembic.ini
index 5f8ee17e..b2e42cfa 100644
--- a/backend/migrations/alembic.ini
+++ b/backend/migrations/alembic.ini
@@ -7,3 +7,38 @@
# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 9386feb4..05445036 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -30,8 +30,9 @@ gevent-websocket==0.10.1
# Environment variables
python-dotenv==1.2.2
-# YAML parsing (for Docker Compose)
+# YAML / TOML parsing (for Docker Compose and repository manifests)
PyYAML==6.0.1
+tomli>=2.0.0; python_version < '3.11'
# Rate limiting
Flask-Limiter==3.5.0
diff --git a/docker-compose.yml b/docker-compose.yml
index a15646de..c5b4b8c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,11 +55,13 @@ services:
depends_on:
backend:
condition: service_healthy
+ volumes:
+ - ./frontend/dist:/usr/share/nginx/html:ro
networks:
- serverkit-network
restart: unless-stopped
healthcheck:
- test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost/"]
+ test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1/"]
interval: 30s
timeout: 10s
retries: 3