Merge remote changes and resolve conflicts

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,18 @@ 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: