From 8a24694b02422cebebc9acb6a125bc09092ae8d1 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Tue, 24 Dec 2024 18:44:16 +0600
Subject: [PATCH] =?UTF-8?q?cha2524222fvdf=D0=B0=D0=B2=D0=B2dddddddddddddd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml         | 21 ++++++++++++++-------
 docker/frontend/Dockerfile | 15 ++++++++++++++-
 docker/nginx/Dockerfile    | 22 ++++++----------------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5068f43..b10c663 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,11 +7,6 @@ services:
       dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
     restart: unless-stopped
-    ports:
-      - "80:80"
-    volumes:
-      - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
     depends_on:
       - backend
 
@@ -28,7 +23,19 @@ services:
       - ./backend:/app
       - sqlite_data:/app/instance
     ports:
-      - "8000:8000"
+      - "8081:8000"
+
+  nginx:
+    build:
+      context: ./docker/nginx
+      dockerfile: Dockerfile
+    container_name: support-nginx
+    restart: unless-stopped
+    ports:
+      - "8080:80"  # Изменено с 80:80 на 8080:80
+    depends_on:
+      - frontend
+      - backend
 
 volumes:
-  sqlite_data:
\ No newline at end of file
+  sqlite_data:
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index a01b8e3..d33e045 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -24,8 +24,21 @@ RUN mkdir -p /etc/nginx/conf.d
 COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
 # Create required directories and set permissions
+RUN mkdir -p /var/cache/nginx \
+             /var/cache/nginx/client_temp \
+             /var/cache/nginx/proxy_temp \
+             /var/cache/nginx/fastcgi_temp \
+             /var/cache/nginx/uwsgi_temp \
+             /var/cache/nginx/scgi_temp \
+             /var/run \
+    && chmod 777 /var/cache/nginx \
+                 /var/cache/nginx/client_temp \
+                 /var/cache/nginx/proxy_temp \
+                 /var/cache/nginx/fastcgi_temp \
+                 /var/cache/nginx/uwsgi_temp \
+                 /var/cache/nginx/scgi_temp \
+                 /var/run
 
 # Remove user directive from nginx config
-RUN sed -i '/user/d' /etc/nginx/nginx.conf
 
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 92ceee6..870949f 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,6 +1,6 @@
 FROM nginx:alpine
 
-# Copy nginx configuration files
+# Copy configuration files
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY conf.d/default.conf /etc/nginx/conf.d/default.conf
 
@@ -12,21 +12,11 @@ RUN mkdir -p /var/cache/nginx \
              /var/cache/nginx/uwsgi_temp \
              /var/cache/nginx/scgi_temp \
              /var/run \
+    && chmod -R 755 /var/cache/nginx \
+    && chmod -R 755 /etc/nginx \
     && chown -R nginx:nginx /var/cache/nginx \
-                           /var/cache/nginx/client_temp \
-                           /var/cache/nginx/proxy_temp \
-                           /var/cache/nginx/fastcgi_temp \
-                           /var/cache/nginx/uwsgi_temp \
-                           /var/cache/nginx/scgi_temp \
-                           /var/run \
-    && chmod 755 /var/cache/nginx \
-                 /var/cache/nginx/client_temp \
-                 /var/cache/nginx/proxy_temp \
-                 /var/cache/nginx/fastcgi_temp \
-                 /var/cache/nginx/uwsgi_temp \
-                 /var/cache/nginx/scgi_temp \
-                 /var/run
+    && chown -R nginx:nginx /etc/nginx
 
-EXPOSE 80
+EXPOSE 8000
 
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+CMD ["nginx", "-g", "daemon off;"]