diff --git a/docker-compose.yml b/docker-compose.yml index 3b6bde3..4f101e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,23 +3,27 @@ version: '3.8' services: frontend: build: - context: . - dockerfile: docker/frontend/Dockerfile + context: ./frontend + dockerfile: ../docker/frontend/Dockerfile container_name: support-frontend restart: unless-stopped + volumes: + - ./frontend:/app + - /app/node_modules depends_on: - backend backend: build: - context: . - dockerfile: docker/backend/Dockerfile + context: ./backend + 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 nginx: @@ -38,4 +42,4 @@ services: volumes: sqlite_data: - frontend_build: + frontend_build: \ No newline at end of file diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 1749354..85ba27d 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -2,17 +2,23 @@ FROM node:18-alpine as build WORKDIR /app -COPY frontend/package*.json ./ +# Копируем только package.json и package-lock.json +COPY package*.json ./ RUN npm install -COPY frontend/ . +# Копируем исходники +COPY . . RUN npm run build FROM nginx:alpine -COPY --from=build /app/dist /usr/share/nginx/html -COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf -# Создаем необходимые директории и назначаем права +# Копируем собранные файлы из build stage +COPY --from=build /app/dist /usr/share/nginx/html + +# Копируем конфиг nginx +COPY nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf + +# Создаем директории и назначаем права RUN mkdir -p /var/cache/nginx \ /var/cache/nginx/client_temp \ /var/cache/nginx/proxy_temp \