23:53

docker-compose.yml

@@ -4,7 +4,6 @@ services:
       context: .
       dockerfile: docker/frontend/Dockerfile
     container_name: frontend
-    restart: unless-stopped
     networks:
       - app-network
 
@@ -13,7 +12,6 @@ services:
       context: .
       dockerfile: docker/backend/Dockerfile
     container_name: backend
-    restart: unless-stopped
     environment:
       - TELEGRAM_BOT_TOKEN=7677506032:AAHEqNUr1lIUfNVbLwaWIaPeKKShsCyz3eo
       - TELEGRAM_CHAT_ID=-1002037023574
@@ -28,11 +26,8 @@ services:
       context: .
       dockerfile: docker/nginx/Dockerfile
     container_name: nginx
-    restart: unless-stopped
     ports:
       - "80:80"
-    volumes:
-      - ./docker/nginx/conf.d:/etc/nginx/conf.d
     depends_on:
       - frontend
       - backend

docker/frontend/Dockerfile

@@ -3,34 +3,27 @@ FROM node:18-alpine as build
 
 WORKDIR /app
 
-# Install dependencies
+# Copy package files
 COPY frontend/package*.json ./
-RUN npm install
 
-# Copy source files
+# Install dependencies
+RUN npm ci
+
+# Copy source code
 COPY frontend/ ./
 
-# Build the application
+# Build the app
 RUN npm run build
 
-# Debug output
-RUN echo "Build output:" && ls -la dist/
-
 # Production stage
 FROM nginx:alpine
 
-# Remove default nginx static assets
-RUN rm -rf /usr/share/nginx/html/*
+# Copy built files
+COPY --from=build /app/dist /usr/share/nginx/html
 
-# Copy built assets from builder stage
-COPY --from=build /app/dist/ /usr/share/nginx/html/
-
-# Copy nginx configuration
+# Add nginx config
 COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
-# Debug: Verify files
-RUN echo "Files in nginx html dir:" && ls -la /usr/share/nginx/html/
-
 EXPOSE 80
 
 CMD ["nginx", "-g", "daemon off;"]

docker/nginx/conf.d/default.conf

@@ -1,24 +1,18 @@
 server {
-    listen 80;
-    server_name 185.139.70.62;
-
+    listen 80 default_server;
+    listen [::]:80 default_server;
+    
     root /usr/share/nginx/html;
     index index.html;
 
-    # Enable debug logging
-    error_log /var/log/nginx/error.log debug;
+    # Logging
     access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
 
-    # Handle all routes for the SPA
+    # SPA routes
     location / {
         try_files $uri $uri/ /index.html;
-        add_header Cache-Control "no-cache";
-    }
-
-    # Admin route
-    location /admin {
-        try_files $uri $uri/ /index.html;
-        add_header Cache-Control "no-cache";
+        add_header Cache-Control "no-store, no-cache, must-revalidate";
     }
 
     # API proxy
@@ -28,15 +22,9 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';
         proxy_set_header Host $host;
+        proxy_cache_bypass $http_upgrade;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
     }
-
-    # Static assets
-    location /assets/ {
-        alias /usr/share/nginx/html/assets/;
-        expires 1y;
-        add_header Cache-Control "public, no-transform";
-    }
 }