diff --git a/docker-compose.yml b/docker-compose.yml index c2d55d3..2f06132 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,44 +3,28 @@ 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: - - ./frontend:/app - - /app/node_modules ports: - - "3000:80" + - "80:80" + depends_on: + - backend backend: build: - context: ./backend - dockerfile: ../docker/backend/Dockerfile + context: . + dockerfile: docker/backend/Dockerfile container_name: support-backend restart: unless-stopped environment: - TELEGRAM_BOT_TOKEN=7677506032:AAHEqNUr1lIUfNVbLwaWIaPeKKShsCyz3eo - TELEGRAM_CHAT_ID=-1002037023574 volumes: - - ./backend:/app - sqlite_data:/app/instance ports: - "8000:8000" - nginx: - image: nginx:alpine - container_name: support-nginx - 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 - - ./frontend/dist:/usr/share/nginx/html:ro - depends_on: - - frontend - - backend - volumes: sqlite_data: diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 76d6c6e..b864164 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -2,14 +2,13 @@ FROM python:3.11-slim WORKDIR /app -# Копируем requirements.txt -COPY backend/requirements.txt . +RUN apt-get update && apt-get install -y \ + gcc \ + && rm -rf /var/lib/apt/lists/* -# Устанавливаем зависимости +COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt -# Копируем исходники -COPY backend/ . +COPY . . -# Запускаем приложение CMD ["python", "run.py"] diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 6eedda3..b505393 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -22,7 +22,7 @@ FROM nginx:alpine COPY --from=builder /app/dist /usr/share/nginx/html # Копируем конфигурацию nginx -COPY nginx.conf /etc/nginx/conf.d/default.conf +COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf # Указываем команду для запуска nginx CMD ["nginx", "-g", "daemon off;"]