1
0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00

cha2524222fvdfаввdddddddddddddd

This commit is contained in:
MoonTestUse1
2024-12-24 18:44:16 +06:00
parent 8be8ed68f9
commit 8a24694b02
3 changed files with 34 additions and 24 deletions

View File

@@ -7,11 +7,6 @@ services:
dockerfile: docker/frontend/Dockerfile dockerfile: docker/frontend/Dockerfile
container_name: support-frontend container_name: support-frontend
restart: unless-stopped 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: depends_on:
- backend - backend
@@ -28,7 +23,19 @@ services:
- ./backend:/app - ./backend:/app
- sqlite_data:/app/instance - sqlite_data:/app/instance
ports: 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: volumes:
sqlite_data: sqlite_data:

View File

@@ -24,8 +24,21 @@ RUN mkdir -p /etc/nginx/conf.d
COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
# Create required directories and set permissions # 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 # Remove user directive from nginx config
RUN sed -i '/user/d' /etc/nginx/nginx.conf
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]

View File

@@ -1,6 +1,6 @@
FROM nginx:alpine FROM nginx:alpine
# Copy nginx configuration files # Copy configuration files
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
COPY conf.d/default.conf /etc/nginx/conf.d/default.conf COPY conf.d/default.conf /etc/nginx/conf.d/default.conf
@@ -12,21 +12,11 @@ RUN mkdir -p /var/cache/nginx \
/var/cache/nginx/uwsgi_temp \ /var/cache/nginx/uwsgi_temp \
/var/cache/nginx/scgi_temp \ /var/cache/nginx/scgi_temp \
/var/run \ /var/run \
&& chmod -R 755 /var/cache/nginx \
&& chmod -R 755 /etc/nginx \
&& chown -R nginx:nginx /var/cache/nginx \ && chown -R nginx:nginx /var/cache/nginx \
/var/cache/nginx/client_temp \ && chown -R nginx:nginx /etc/nginx
/var/cache/nginx/proxy_temp \
/var/cache/nginx/fastcgi_temp \
/var/cache/nginx/uwsgi_temp \
/var/cache/nginx/scgi_temp \
/var/run \
&& chmod 755 /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
EXPOSE 80 EXPOSE 8000
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]