From d1bf50a8400cc51f27b5ba2d0e38ce7a53733798 Mon Sep 17 00:00:00 2001 From: L0m1g Date: Thu, 8 May 2025 11:32:06 +0200 Subject: [PATCH] Fix: remove container and venv for development --- Dockerfile | 12 ------------ dev.sh | 4 ---- docker-compose.yml | 10 ---------- erminig/cli/init.py | 8 ++++++-- 4 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 Dockerfile delete mode 100755 dev.sh delete mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 3e609a9..0000000 --- a/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM fedora:42 - -RUN dnf -y update && \ - dnf -y install python3 python3-pip sqlite tar zstd git bash vim && \ - dnf clean all - -RUN useradd -r -s /sbin/nologin -d /var/lib/erminig pak && \ - mkdir -p /var/lib/erminig /var/cache/erminig /opt/erminig && \ - chown -R pak:pak /var/lib/erminig /var/cache/erminig /opt/erminig - -COPY . /opt/erminig - diff --git a/dev.sh b/dev.sh deleted file mode 100755 index 9162fd8..0000000 --- a/dev.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -echo "🌊 [Erminig] Rebuild and launch dev env..." -podman-compose -f docker-compose.yml build && \ -podman-compose -f docker-compose.yml run erminig \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index afb26da..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '3.9' -services: - erminig: - build: - context: . - volumes: - - ./lib:/var/lib/erminig:z - - ./cache:/var/cache/erminig:z - working_dir: /opt/erminig - command: /bin/bash -c "pip install -e . && exec /bin/bash" diff --git a/erminig/cli/init.py b/erminig/cli/init.py index 5769cf7..136a614 100644 --- a/erminig/cli/init.py +++ b/erminig/cli/init.py @@ -11,8 +11,9 @@ import os import subprocess import sys from pathlib import Path -from erminig.core.security import check_root, check_user_exists +from erminig.core.security import check_root, check_user_exists, run_as_user from erminig.core.config import Config +from erminig.models.db import init_db PAK_USER = Config.PAK_USER @@ -41,7 +42,7 @@ def create_user_pak(): def setup_directories(): """Crée les dossiers nécessaires et assigne les permissions.""" - for directory in [Config.LIB_DIR, Config.CACHE_DIR]: + for directory in [Config.LIB_DIR, Config.CACHE_DIR, Config.BASE_DIR]: if not directory.exists(): print(f"[INIT] Création du dossier {directory}...") directory.mkdir(parents=True, exist_ok=True) @@ -58,6 +59,9 @@ def main(): create_user_pak() setup_directories() + print("[INIT] Initialisation de la base de données...") + init_db() + print("[INIT] Environnement Erminig initialisé avec succès.")