From 56efe658283420914921a88ace8f7737bc1e2255 Mon Sep 17 00:00:00 2001
From: Sergey Revyakin <revyakin8800@gmail.com>
Date: Tue, 17 Feb 2026 17:54:32 +0700
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D1=8D=D1=88=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=83=20=D0=B4=D0=BE=D0=BA=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .venv-sdr/bin/numpy-config                |  6 ------
 deploy/docker/Dockerfile.nn_server        | 17 ++++++++++-------
 deploy/docker/Dockerfile.server_to_master |  6 ++++--
 deploy/docker/docker-compose.yml          |  8 +++++---
 4 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100755 .venv-sdr/bin/numpy-config

diff --git a/.venv-sdr/bin/numpy-config b/.venv-sdr/bin/numpy-config
deleted file mode 100755
index fd93d80..0000000
--- a/.venv-sdr/bin/numpy-config
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/home/sibscience-4/from_ssh/DroneDetector/.venv-sdr/bin/python3
-import sys
-from numpy._configtool import main
-if __name__ == '__main__':
-    sys.argv[0] = sys.argv[0].removesuffix('.exe')
-    sys.exit(main())
diff --git a/deploy/docker/Dockerfile.nn_server b/deploy/docker/Dockerfile.nn_server
index 5e25ff3..9be0840 100644
--- a/deploy/docker/Dockerfile.nn_server
+++ b/deploy/docker/Dockerfile.nn_server
@@ -1,9 +1,10 @@
+# syntax=docker/dockerfile:1.7
 FROM nvidia/cuda:12.8.1-cudnn-runtime-ubuntu22.04
 
 ENV DEBIAN_FRONTEND=noninteractive \
     PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
-    PYTHONPATH=/app
+    PYTHONPATH=/app:/app/NN_server
 
 WORKDIR /app
 
@@ -21,14 +22,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY deploy/requirements/nn_gpu_pinned.txt /tmp/nn_gpu_pinned.txt
 COPY deploy/requirements/nn_common.txt /tmp/nn_common.txt
 
-RUN python3 -m pip install --no-cache-dir --upgrade pip && \
-    python3 -m pip install --no-cache-dir -r /tmp/nn_gpu_pinned.txt && \
-    python3 -m pip install --no-cache-dir -r /tmp/nn_common.txt
+RUN --mount=type=cache,target=/root/.cache/pip \
+    python3 -m pip install --upgrade pip && \
+    python3 -m pip install -r /tmp/nn_gpu_pinned.txt && \
+    python3 -m pip install -r /tmp/nn_common.txt
 
 COPY . /app
 
-RUN python3 -m pip install --no-cache-dir -e /app/torchsig
+RUN --mount=type=cache,target=/root/.cache/pip \
+    python3 -m pip install -e /app/torchsig
 
-WORKDIR /app
+WORKDIR /app/NN_server
 EXPOSE 8080
-CMD ["python3", "-m", "NN_server.server"]
+CMD ["python3", "server.py"]
diff --git a/deploy/docker/Dockerfile.server_to_master b/deploy/docker/Dockerfile.server_to_master
index 61156f2..f874053 100644
--- a/deploy/docker/Dockerfile.server_to_master
+++ b/deploy/docker/Dockerfile.server_to_master
@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.7
 FROM python:3.11-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1 \
@@ -11,8 +12,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 COPY deploy/requirements/server_to_master.txt /tmp/requirements.txt
-RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /tmp/requirements.txt
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install --upgrade pip && \
+    pip install -r /tmp/requirements.txt
 
 COPY . /app
 
diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml
index 11e6022..7ed8eb6 100644
--- a/deploy/docker/docker-compose.yml
+++ b/deploy/docker/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
   dronedetector-server-to-master:
     container_name: dronedetector-server-to-master
+    image: dronedetector-server-to-master:latest
     build:
       context: ../..
       dockerfile: deploy/docker/Dockerfile.server_to_master
@@ -18,15 +19,16 @@ services:
 
   dronedetector-nn-server:
     container_name: dronedetector-nn-server
+    image: dronedetector-nn-server:latest
     build:
       context: ../..
       dockerfile: deploy/docker/Dockerfile.nn_server
     env_file:
       - ../../.env
     environment:
-      - PYTHONPATH=/app
-    working_dir: /app
-    command: ["python3", "-m", "NN_server.server"]
+      - PYTHONPATH=/app:/app/NN_server
+    working_dir: /app/NN_server
+    command: ["python3", "server.py"]
     restart: unless-stopped
     depends_on:
       - dronedetector-server-to-master