diff --git a/docker-compose.yml b/docker-compose.yml index 8b576d0..e0b9c4e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,9 @@ services: container_name: lawn-scheduler-app restart: unless-stopped volumes: - - ./uploads:/app/uploads - - ./db:/app/db + - frontend-build:/app/public # Готовая сборка фронтенда + - ./uploads:/app/uploads # Файлы загрузок + - ./db:/app/db # База данных SQLite user: "1001:1001" environment: - NODE_ENV=production @@ -22,10 +23,10 @@ services: - "80:80" - "443:443" volumes: - - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro - - ./nginx/conf.d:/etc/nginx/conf.d:ro - - ./uploads:/var/www/uploads:ro - - ./public:/var/www/html:ro + - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro # Основной конфиг + - ./nginx/conf.d:/etc/nginx/conf.d:ro # Доп. конфиги + - ./uploads:/var/www/uploads:ro # Статика загружаемая пользователем + - frontend-build:/var/www/html:ro # Сборка фронтенда networks: - lawn-scheduler-network depends_on: @@ -36,5 +37,6 @@ networks: driver: bridge volumes: + frontend-build: uploads: - database: \ No newline at end of file + database: diff --git a/package.json b/package.json index a395761..ef0802d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "lawn-mowing-scheduler", "private": true, - "version": "0.5.9", + "version": "0.6.0", "type": "module", "scripts": { "dev": "concurrently \"npm run server\" \"npm run client\"",