From ce4578ab170ac69592e77c11e4cdbf15de9863c5 Mon Sep 17 00:00:00 2001 From: MoonTestUse1 Date: Tue, 24 Dec 2024 16:50:31 +0600 Subject: [PATCH] =?UTF-8?q?cha2524222fvdf=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 25 +++++++++++++++++++------ docker/frontend/Dockerfile | 36 ++---------------------------------- 2 files changed, 21 insertions(+), 40 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 950ab58..2c9d0e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,29 +1,42 @@ version: '3.8' services: + nginx: + image: nginx:alpine + container_name: support-nginx + ports: + - "80:80" + volumes: + - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro + - frontend_build:/usr/share/nginx/html + depends_on: + - frontend + - backend + frontend: build: context: . dockerfile: docker/frontend/Dockerfile container_name: support-frontend - ports: - - "80:80" - depends_on: - - backend + volumes: + - frontend_build:/app/dist backend: build: context: . dockerfile: docker/backend/Dockerfile container_name: support-backend + restart: unless-stopped environment: - TELEGRAM_BOT_TOKEN=7677506032:AAHEqNUr1lIUfNVbLwaWIaPeKKShsCyz3eo - TELEGRAM_CHAT_ID=-1002037023574 volumes: - ./backend:/app - sqlite_data:/app/instance - ports: - - "8000:8000" + expose: + - "8000" volumes: sqlite_data: + frontend_build: diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 406d4c7..d486487 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine as build +FROM node:18-alpine WORKDIR /app @@ -10,36 +10,4 @@ RUN npm install COPY frontend/ . # Build the app -RUN npm run build - -FROM nginx:alpine - -# Copy built files -COPY --from=build /app/dist /usr/share/nginx/html - -# Create nginx config directory -RUN mkdir -p /etc/nginx/conf.d - -# Copy nginx configuration -COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf - -# Create required directories and set permissions -RUN mkdir -p /var/cache/nginx \ - /var/cache/nginx/client_temp \ - /var/cache/nginx/proxy_temp \ - /var/cache/nginx/fastcgi_temp \ - /var/cache/nginx/uwsgi_temp \ - /var/cache/nginx/scgi_temp \ - /var/run \ - && chmod 777 /var/cache/nginx \ - /var/cache/nginx/client_temp \ - /var/cache/nginx/proxy_temp \ - /var/cache/nginx/fastcgi_temp \ - /var/cache/nginx/uwsgi_temp \ - /var/cache/nginx/scgi_temp \ - /var/run - -# Remove user directive from nginx config -RUN sed -i '/user/d' /etc/nginx/nginx.conf - -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +CMD ["npm", "run", "build"]