From 16d22183377f4cc74328161e8a5d0811befd6f11 Mon Sep 17 00:00:00 2001 From: MoonTestUse1 Date: Fri, 27 Dec 2024 05:02:52 +0600 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20=D0=B4=D0=BE=D0=BA=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/frontend/Dockerfile | 8 ++++---- docker/nginx/conf.d/default.conf | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index e668995..75e1d71 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -11,8 +11,8 @@ RUN npm install # Копируем исходный код COPY frontend/ ./ -# Собираем приложение -RUN npm run build +# Открываем порт для разработки +EXPOSE 5173 -# Держим контейнер запущенным -CMD ["tail", "-f", "/dev/null"] \ No newline at end of file +# Запускаем в режиме разработки +CMD ["npm", "run", "dev", "--", "--host"] \ No newline at end of file diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf index 49d8b5f..f628bd8 100644 --- a/docker/nginx/conf.d/default.conf +++ b/docker/nginx/conf.d/default.conf @@ -38,4 +38,24 @@ server { listen 80; server_name 185.139.70.62; return 301 http://itformhelp.ru$request_uri; +} + +server { + listen 80; + server_name localhost; + + location / { + proxy_pass http://frontend:5173; + 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; + } + + location /api { + proxy_pass http://backend:8000; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + } } \ No newline at end of file