From 275d6ae766349ba132f4d1baaad71e511d081a8c Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Tue, 24 Dec 2024 01:58:30 +0600
Subject: [PATCH] change docker555

---
 docker-compose.yml         |  8 ++++----
 docker/backend/Dockerfile  |  9 ++++-----
 docker/frontend/Dockerfile | 20 +++++++++++---------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4f101e2..6e4644a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3.8'
 services:
   frontend:
     build:
-      context: ./frontend
-      dockerfile: ../docker/frontend/Dockerfile
+      context: .
+      dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
     restart: unless-stopped
     volumes:
@@ -15,8 +15,8 @@ services:
 
   backend:
     build:
-      context: ./backend
-      dockerfile: ../docker/backend/Dockerfile
+      context: .
+      dockerfile: docker/backend/Dockerfile
     container_name: support-backend
     restart: unless-stopped
     environment:
diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index 46ca62b..3c7aeb0 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -2,17 +2,16 @@ FROM python:3.11-slim
 
 WORKDIR /app
 
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
     gcc \
     && rm -rf /var/lib/apt/lists/*
 
-# Копируем requirements.txt первым
+# Install Python dependencies
 COPY backend/requirements.txt .
-
-# Устанавливаем зависимости
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Копируем остальные файлы
+# Copy application code
 COPY backend/ .
 
-CMD ["python", "run.py"]
+CMD ["python", "run.py"]
\ No newline at end of file
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 85ba27d..0eb83e2 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -2,23 +2,25 @@ FROM node:18-alpine as build
 
 WORKDIR /app
 
-# Копируем только package.json и package-lock.json
-COPY package*.json ./
+# Copy package files
+COPY frontend/package*.json ./
 RUN npm install
 
-# Копируем исходники
-COPY . .
+# Copy source code
+COPY frontend/ .
+
+# Build the app
 RUN npm run build
 
 FROM nginx:alpine
 
-# Копируем собранные файлы из build stage
+# Copy built files
 COPY --from=build /app/dist /usr/share/nginx/html
 
-# Копируем конфиг nginx
-COPY nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+# Copy nginx config
+COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
-# Создаем директории и назначаем права
+# Create directories and set permissions
 RUN mkdir -p /var/cache/nginx \
              /var/cache/nginx/client_temp \
              /var/cache/nginx/proxy_temp \
@@ -34,7 +36,7 @@ RUN mkdir -p /var/cache/nginx \
                  /var/cache/nginx/scgi_temp \
                  /var/run
 
-# Удаляем директиву user из конфига nginx
+# Remove user directive
 RUN sed -i '/user/d' /etc/nginx/nginx.conf
 
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file