From 635d17144851b5a12dde895aa4e674190e5797f1 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Sat, 4 Jan 2025 05:23:27 +0600
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D1=82=D0=B32222?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/backend/Dockerfile  | 15 +++------------
 docker/frontend/Dockerfile |  4 ++--
 docker/nginx/Dockerfile    |  7 +++++++
 docker/nginx/default.conf  |  3 ++-
 docker/nginx/nginx.conf    |  5 +----
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index 8b74fcd..a0d6057 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -2,21 +2,12 @@ FROM python:3.11-slim
 
 WORKDIR /app
 
-# Устанавливаем необходимые пакеты
-RUN apt-get update && apt-get install -y netcat-traditional dos2unix && rm -rf /var/lib/apt/lists/*
-
 # Устанавливаем зависимости
 COPY backend/requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Копируем код приложения
+# Копируем исходный код
 COPY backend/ .
 
-# Делаем скрипт исполняемым и устанавливаем правильные права
-RUN chmod +x /app/scripts/init.sh && \
-    chown -R root:root /app/scripts/init.sh && \
-    dos2unix /app/scripts/init.sh
-
-EXPOSE 8000
-
-CMD ["/bin/bash", "/app/scripts/init.sh"]
\ No newline at end of file
+# Запускаем приложение
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
\ No newline at end of file
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index fb959ce..efcff00 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -6,8 +6,8 @@ WORKDIR /app
 # Копируем файлы package.json и package-lock.json
 COPY frontend/package*.json ./
 
-# Устанавливаем все зависимости
-RUN npm install
+# Используем npm ci вместо npm install
+RUN npm ci
 
 # Копируем исходный код
 COPY frontend/ .
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 9c40f61..43f4c94 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -13,4 +13,11 @@ RUN mkdir -p /var/www/certbot && \
     mkdir -p /etc/letsencrypt && \
     chmod +x /entrypoint.sh
 
+# Установка правильных прав для nginx
+RUN chown -R nginx:nginx /var/cache/nginx && \
+    chown -R nginx:nginx /var/log/nginx && \
+    chown -R nginx:nginx /etc/nginx/conf.d && \
+    chown -R nginx:nginx /var/www/certbot && \
+    chmod -R 755 /var/www/certbot
+
 ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 349139b..78697ec 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -22,7 +22,8 @@ server {
 
 # Основной HTTPS сервер
 server {
-    listen 443 ssl http2;
+    listen 443 ssl;
+    http2 on;
     server_name itformhelp.ru www.itformhelp.ru;
 
     ssl_certificate /etc/letsencrypt/live/itformhelp.ru/fullchain.pem;
diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
index 3e2573e..2cd7605 100644
--- a/docker/nginx/nginx.conf
+++ b/docker/nginx/nginx.conf
@@ -1,7 +1,4 @@
-user nginx;
-worker_processes auto;
-pid /var/run/nginx.pid;
-
+# Основной конфиг должен быть в /etc/nginx/nginx.conf
 events {
     worker_connections 1024;
     multi_accept on;