change docker

docker-compose.yml

@@ -3,37 +3,35 @@ version: '3.8'
 services:
   frontend:
     build:
-      context: .
+      context: ./frontend
-      dockerfile: docker/frontend/Dockerfile
+      dockerfile: Dockerfile
     container_name: support-frontend
-    restart: unless-stopped
+    volumes:
-    depends_on:
+      - frontend_build:/app/dist
-      - backend
 
   backend:
     build:
-      context: .
+      context: ./backend
-      dockerfile: docker/backend/Dockerfile
+      dockerfile: Dockerfile
     container_name: support-backend
-    restart: unless-stopped
     environment:
       - TELEGRAM_BOT_TOKEN=7677506032:AAHEqNUr1lIUfNVbLwaWIaPeKKShsCyz3eo
       - TELEGRAM_CHAT_ID=-1002037023574
-    volumes:
+    ports:
-      - ./backend:/app
+      - "8000:8000"
-      - sqlite_data:/app/instance
 
   nginx:
-    build:
+    image: nginx:alpine
-      context: .
-      dockerfile: docker/frontend/Dockerfile
     container_name: support-nginx
-    restart: unless-stopped
     ports:
       - "80:80"
+    volumes:
+      - frontend_build:/usr/share/nginx/html:ro
+      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./nginx/conf.d:/etc/nginx/conf.d:ro
     depends_on:
       - frontend
       - backend
 
 volumes:
-  sqlite_data:
+  frontend_build:

docker/backend/Dockerfile

@@ -1,13 +1,10 @@
-# docker/backend/Dockerfile
 FROM python:3.11-slim
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y \
-    gcc \
-    && rm -rf /var/lib/apt/lists/*
-
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-CMD ["python", "run.py"]
+COPY . .
+
+CMD ["uvicorn", "run.py"]

docker/frontend/Dockerfile

@@ -1,20 +1,12 @@
-# docker/frontend/Dockerfile
+FROM node:18-alpine as builder
-FROM node:18-alpine as build
 
 WORKDIR /app
 
-# Copy package files
 COPY package*.json ./
-
-# Install dependencies
 RUN npm install
 
-# Copy source code
 COPY . .
-
-# Build the application
 RUN npm run build
 
-# Copy built files to nginx html directory
+FROM scratch
-FROM nginx:alpine
+COPY --from=builder /app/dist /dist
-COPY --from=build /app/dist /usr/share/nginx/html

docker/nginx/conf.d/default.conf

@@ -1,36 +1,21 @@
-# docker/nginx/conf.d/default.conf
-upstream backend {
-    server backend:8000;
-}
-
 server {
     listen 80;
     server_name localhost;
-    
+
+    root /usr/share/nginx/html;
+    index index.html;
+
     location / {
-        root /usr/share/nginx/html;
-        index index.html;
         try_files $uri $uri/ /index.html;
-        
-        # Disable caching for index.html
         add_header Cache-Control "no-store, no-cache, must-revalidate";
     }
-    
+
     location /api/ {
-        proxy_pass http://backend/;
+        proxy_pass http://backend:8000/;
         proxy_http_version 1.1;
         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;
-    }
-
-    # Handle favicon.ico
-    location = /favicon.ico {
-        access_log off;
-        log_not_found off;
     }
 }