1
0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00
This commit is contained in:
MoonTestUse1
2024-12-25 23:36:39 +06:00
parent 5562983579
commit 481ce35ec1
2 changed files with 25 additions and 9 deletions

View File

@@ -3,6 +3,9 @@ FROM node:18-alpine as build
WORKDIR /app WORKDIR /app
# Debug: Show working directory
RUN pwd && ls -la
# Copy package files # Copy package files
COPY frontend/package*.json ./ COPY frontend/package*.json ./
@@ -12,9 +15,15 @@ RUN npm install
# Copy source code # Copy source code
COPY frontend/ ./ COPY frontend/ ./
# Debug: Show files before build
RUN echo "Files before build:" && ls -la
# Build the app # Build the app
RUN npm run build RUN npm run build
# Debug: Show build output
RUN echo "Build output:" && ls -la dist/
# Production stage # Production stage
FROM nginx:alpine FROM nginx:alpine
@@ -27,14 +36,8 @@ COPY --from=build /app/dist/ /usr/share/nginx/html/
# Copy nginx configuration # Copy nginx configuration
COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
# Ensure correct permissions # Debug: Show copied files
RUN chown -R nginx:nginx /usr/share/nginx/html && \ RUN echo "Files in nginx html dir:" && ls -la /usr/share/nginx/html/
chmod -R 755 /usr/share/nginx/html && \
chown -R nginx:nginx /var/cache/nginx && \
chown -R nginx:nginx /var/log/nginx && \
chown -R nginx:nginx /etc/nginx/conf.d
USER nginx
EXPOSE 80 EXPOSE 80

View File

@@ -1,15 +1,27 @@
server { server {
listen 80; listen 80;
server_name localhost; server_name 185.139.70.62;
root /usr/share/nginx/html; root /usr/share/nginx/html;
index index.html; index index.html;
# Enable debug logging
error_log /var/log/nginx/error.log debug;
access_log /var/log/nginx/access.log;
# Handle all routes for the SPA
location / { location / {
try_files $uri $uri/ /index.html; try_files $uri $uri/ /index.html;
add_header Cache-Control "no-cache"; add_header Cache-Control "no-cache";
} }
# Admin route
location /admin {
try_files $uri $uri/ /index.html;
add_header Cache-Control "no-cache";
}
# API proxy
location /api/ { location /api/ {
proxy_pass http://backend:8000; proxy_pass http://backend:8000;
proxy_http_version 1.1; proxy_http_version 1.1;
@@ -21,6 +33,7 @@ server {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
} }
# Static assets
location /assets/ { location /assets/ {
alias /usr/share/nginx/html/assets/; alias /usr/share/nginx/html/assets/;
expires 1y; expires 1y;