From 2f7a6951285ddfb7b2763c42a364a7d000dc81ee Mon Sep 17 00:00:00 2001 From: 1 Date: Wed, 25 Dec 2024 13:33:45 +0600 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=20=D1=84=D0=B0=D0=BA=D1=82=20?= =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D0=B7=D0=B0=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=B5=D1=82)=20=D0=B24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 9 ++++----- docker/nginx/Dockerfile | 13 +++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a0ee9da..d2cdbb8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,20 +20,19 @@ services: volumes: - ./backend:/app - sqlite_data:/app/instance + ports: + - "8081:8000" nginx: build: context: ./docker/nginx - dockerfile: Dockerfile container_name: support-nginx restart: unless-stopped ports: - - "80:80" # Вернем на стандартный порт 80 - volumes: - - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro + - "8080:80" depends_on: - frontend - backend volumes: - sqlite_data: + sqlite_data: \ No newline at end of file diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index f6c7d23..6831bc8 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,17 +1,18 @@ FROM nginx:alpine -# Создаем необходимые директории +# Create required directories 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/cache/nginx/scgi_temp \ + /var/run -# Копируем конфигурацию -COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf -COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf +# Copy configuration files +COPY conf.d/default.conf /etc/nginx/conf.d/ +COPY nginx.conf /etc/nginx/ EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file