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

change docker

This commit is contained in:
MoonTestUse1
2024-12-23 23:26:35 +06:00
parent 7d6a424c8d
commit ae3e0a1f0a
3 changed files with 21 additions and 15 deletions

View File

@@ -3,8 +3,8 @@ version: '3.8'
services:
frontend:
build:
context: .
dockerfile: docker/frontend/Dockerfile
context: ./frontend
dockerfile: ../docker/frontend/Dockerfile
container_name: support-frontend
restart: unless-stopped
depends_on:
@@ -23,15 +23,13 @@ services:
- sqlite_data:/app/instance
nginx:
image: nginx:alpine
build:
context: ./frontend
dockerfile: ../docker/frontend/Dockerfile
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

View File

@@ -1,18 +1,19 @@
FROM node:18-alpine
FROM node:18-alpine as builder
WORKDIR /app
# Copy package files
COPY frontend/package*.json ./
COPY package*.json ./
# Install dependencies
RUN npm install
# Copy source code
COPY frontend/ .
COPY . .
# Build the app
RUN npm run build
# Keep container running and serve the built files
CMD ["npm", "run", "preview"]
# Production stage
FROM nginx:alpine
COPY --from=builder /app/dist /usr/share/nginx/html

View File

@@ -1,5 +1,5 @@
upstream backend {
server backend:8000; # Changed from 8080 to 8000
server backend:8000; # Changed from 8080 to match FastAPI port
}
server {
@@ -9,8 +9,9 @@ server {
root /usr/share/nginx/html;
index index.html;
# Fix permissions and routing
location / {
try_files $uri $uri/ /index.html;
try_files $uri $uri/ /index.html =404;
add_header Cache-Control "no-cache";
}
@@ -25,4 +26,10 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}
# Add explicit favicon handling
location = /favicon.ico {
access_log off;
log_not_found off;
}
}