1
0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00

change docker555

This commit is contained in:
MoonTestUse1
2024-12-24 00:18:28 +06:00
parent 8e0994ba3c
commit 2823b35753
3 changed files with 18 additions and 8 deletions

View File

@@ -7,8 +7,6 @@ services:
dockerfile: docker/frontend/Dockerfile dockerfile: docker/frontend/Dockerfile
container_name: support-frontend container_name: support-frontend
restart: unless-stopped restart: unless-stopped
ports:
- "80:80"
depends_on: depends_on:
- backend - backend
@@ -23,8 +21,21 @@ services:
- TELEGRAM_CHAT_ID=-1002037023574 - TELEGRAM_CHAT_ID=-1002037023574
volumes: volumes:
- sqlite_data:/app/instance - sqlite_data:/app/instance
nginx:
image: nginx:alpine
container_name: support-nginx
restart: unless-stopped
ports: 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: volumes:
sqlite_data: sqlite_data:
frontend_build:

View File

@@ -6,9 +6,11 @@ RUN apt-get update && apt-get install -y \
gcc \ gcc \
&& rm -rf /var/lib/apt/lists/* && 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 RUN pip install --no-cache-dir -r requirements.txt
COPY . . # Копируем остальные файлы
COPY ./backend /app/
CMD ["python", "run.py"] CMD ["python", "run.py"]

View File

@@ -21,8 +21,5 @@ FROM nginx:alpine
# Копируем собранные файлы из этапа сборки # Копируем собранные файлы из этапа сборки
COPY --from=builder /app/dist /usr/share/nginx/html COPY --from=builder /app/dist /usr/share/nginx/html
# Копируем конфигурацию nginx
COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
# Указываем команду для запуска nginx # Указываем команду для запуска nginx
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]