resolve conflict
This commit is contained in:
@@ -0,0 +1,13 @@
|
|||||||
|
import { defineConfig } from 'vite'
|
||||||
|
import react from '@vitejs/plugin-react'
|
||||||
|
import tailwindcss from '@tailwindcss/vite'
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [react(), tailwindcss()],
|
||||||
|
server: {
|
||||||
|
host: true,
|
||||||
|
proxy: {
|
||||||
|
'/api': 'http://localhost:3001',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
services:
|
||||||
|
backend:
|
||||||
|
build: ./server
|
||||||
|
container_name: dashboard-backend
|
||||||
|
ports:
|
||||||
|
- "3001:3001"
|
||||||
|
environment:
|
||||||
|
# Root path on the Docker host to mount inside the container.
|
||||||
|
# Dashboard VM: HOST_BROWSE_ROOT=/home/wnc
|
||||||
|
# Windows Docker Desktop: HOST_BROWSE_ROOT=C:/Users
|
||||||
|
# Then enter paths under /host/... in the dashboard settings.
|
||||||
|
- HOST_BROWSE_ROOT=${HOST_BROWSE_ROOT:-/home/wnc}
|
||||||
|
- HOST_MOUNT_ROOT=/host
|
||||||
|
volumes:
|
||||||
|
- type: bind
|
||||||
|
source: ./server
|
||||||
|
target: /app
|
||||||
|
- type: bind
|
||||||
|
source: ${HOST_BROWSE_ROOT:-/home/wnc}
|
||||||
|
target: /host
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
build: ./dashboard
|
||||||
|
container_name: dashboard-frontend
|
||||||
|
ports:
|
||||||
|
- "5173:80"
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
|
restart: unless-stopped
|
||||||
+2
-11
@@ -14,16 +14,6 @@ http {
|
|||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
|
||||||
# Scan endpoints may run for several minutes on network shares.
|
|
||||||
location ~ ^/api/config(/rescan|/rescan-results)?$ {
|
|
||||||
proxy_pass http://backend;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_read_timeout 600s;
|
|
||||||
proxy_send_timeout 600s;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Frontend (default)
|
# Frontend (default)
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://frontend;
|
proxy_pass http://frontend;
|
||||||
@@ -42,7 +32,8 @@ http {
|
|||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_read_timeout 60s;
|
proxy_read_timeout 600s;
|
||||||
|
proxy_send_timeout 600s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user