diff --git a/docker-compose.yml b/docker-compose.yml index 5068f43..0fea816 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,11 +7,6 @@ services: dockerfile: docker/frontend/Dockerfile container_name: support-frontend restart: unless-stopped - ports: - - "80:80" - volumes: - - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro depends_on: - backend @@ -28,7 +23,18 @@ services: - ./backend:/app - sqlite_data:/app/instance ports: - - "8000:8000" + - "8081:8000" + nginx: + build: + context: ./docker/nginx + dockerfile: Dockerfile + container_name: support-nginx + restart: unless-stopped + ports: + - "8080:80" # Изменено с 80:80 на 8080:80 + depends_on: + - frontend + - backend volumes: sqlite_data: \ No newline at end of file diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index d33e045..4cd64de 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -21,24 +21,4 @@ COPY --from=build /app/dist /usr/share/nginx/html 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 - -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 4a24739..a4cff8f 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -4,11 +4,7 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf COPY 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 \ +RUN mkdir -p /var/cache/nginx \ -12,21 +12,11 @@ RUN mkdir -p /var/cache/nginx \ /var/cache/nginx/uwsgi_temp \ /var/cache/nginx/scgi_temp \ /var/run \ @@ -19,4 +15,4 @@ RUN mkdir -p /var/cache/nginx \ EXPOSE 8000 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +CMD ["nginx", "-g", "daemon off;"]