diff --git a/docker-compose.yml b/docker-compose.yml index 2f06132..3b6bde3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,6 @@ services: dockerfile: docker/frontend/Dockerfile container_name: support-frontend restart: unless-stopped - ports: - - "80:80" depends_on: - backend @@ -23,8 +21,21 @@ services: - TELEGRAM_CHAT_ID=-1002037023574 volumes: - sqlite_data:/app/instance + + nginx: + image: nginx:alpine + container_name: support-nginx + restart: unless-stopped ports: - - "8000:8000" + - "80:80" + volumes: + - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro + - frontend_build:/usr/share/nginx/html + depends_on: + - frontend + - backend volumes: sqlite_data: + frontend_build: diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index b864164..3680c5f 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -6,9 +6,11 @@ RUN apt-get update && apt-get install -y \ gcc \ && rm -rf /var/lib/apt/lists/* -COPY requirements.txt . +# Копируем только requirements.txt сначала +COPY ./backend/requirements.txt /app/ RUN pip install --no-cache-dir -r requirements.txt -COPY . . +# Копируем остальные файлы +COPY ./backend /app/ CMD ["python", "run.py"] diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index b505393..acd317f 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -21,8 +21,5 @@ FROM nginx:alpine # Копируем собранные файлы из этапа сборки COPY --from=builder /app/dist /usr/share/nginx/html -# Копируем конфигурацию nginx -COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf - # Указываем команду для запуска nginx CMD ["nginx", "-g", "daemon off;"]