diff --git a/Dockerfile b/Dockerfile index 6f39d48..85f0de2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y \ libffi-dev \ shared-mime-info \ fonts-dejavu \ + docker.io \ && rm -rf /var/lib/apt/lists/* # Копирование requirements и установка зависимостей diff --git a/docker-compose.yml b/docker-compose.yml index 4f2b655..4b5e02d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ services: - MUTT_DIR=/home/matrixhasyou/mutt - GOOGLE_CREDS_FILE=/home/matrixhasyou/domovoy_google_creds.json volumes: + - /var/run/docker.sock:/var/run/docker.sock - ./logs:/app/logs - ./exports:/app/exports - ./data:/app/data @@ -36,6 +37,7 @@ services: - MUTT_DIR=/home/matrixhasyou/mutt - GOOGLE_CREDS_FILE=/home/matrixhasyou/domovoy_google_creds.json volumes: + - /var/run/docker.sock:/var/run/docker.sock - ./logs:/app/logs - ./exports:/app/exports - ./data:/app/data diff --git a/web/app.py b/web/app.py index 96a3bee..c7e1455 100644 --- a/web/app.py +++ b/web/app.py @@ -888,7 +888,7 @@ async def api_gis_status(username: str = Depends(get_current_admin)): except Exception as e: return JSONResponse(status_code=500, content={"message": str(e)}) -@app.post("/api/infra/run_sudrf_parser") +@app.post("/api/sudrf/run") async def api_run_sudrf_parser(username: str = Depends(get_current_admin)): try: subprocess.run(["docker", "exec", "lkm37-gis-scraper", "pkill", "-f", "sudrf_reaper.py"]) @@ -897,7 +897,7 @@ async def api_run_sudrf_parser(username: str = Depends(get_current_admin)): except Exception as e: return JSONResponse(status_code=500, content={"message": str(e)}) -@app.get("/api/infra/sudrf_status") +@app.get("/api/sudrf/status") async def api_sudrf_status(username: str = Depends(get_current_admin)): try: proc = subprocess.run(["docker", "exec", "lkm37-gis-scraper", "ps", "aux"], capture_output=True, text=True) diff --git a/web/templates/sudrf.html b/web/templates/sudrf.html index fc8a903..a309498 100644 --- a/web/templates/sudrf.html +++ b/web/templates/sudrf.html @@ -47,9 +47,12 @@ СЕССИЯ И ЛОГИ СКАНИРОВАНИЯ