diff --git a/README.md b/README.md index 305aca0..1660535 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ docker compose exec backend python manage.py createsuperuser ### Выполнить Собрать статику Django: ``` -docker compose exec backend python manage.py collectstatic +sudo docker compose -f docker-compose.production.yml exec backend python manage.py collectstatic sudo docker compose -f docker-compose.production.yml exec backend cp -r /app/collected_static/. /app/static/ ``` diff --git a/docker-compose.production.yml b/docker-compose.production.yml index b6bdd9b..e5a5d50 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -35,7 +35,7 @@ services: image: documents23/document-template-engine_gateway:latest env_file: .env ports: - - 8088:80 + - 9000:80 volumes: - static:/staticfiles/ - media:/app/media/ diff --git a/docker-compose.yml b/docker-compose.yml index d6cbfcc..45dda0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: build: ./nginx/ env_file: .env ports: - - 8088:80 + - 9000:80 volumes: - static:/staticfiles/ - media:/app/media/ diff --git a/gateway/nginx.conf b/gateway/nginx.conf index 8b078fc..f823e86 100644 --- a/gateway/nginx.conf +++ b/gateway/nginx.conf @@ -1,52 +1,22 @@ server { listen 80; - - location /media/ { - proxy_set_header Host $http_host; - root /var/html/; - } - - location /static/admin/ { - proxy_set_header Host $http_host; - root /var/html/; - } - - location /static/rest_framework/ { - proxy_set_header Host $http_host; - root /var/html/; - } - - location /static/drf-yasg/ { - proxy_set_header Host $http_host; - root /var/html/; - } - - location /admin/ { - proxy_set_header Host $http_host; - proxy_pass http://backend:9000/admin/; - } + index index.html; location /api/ { - proxy_set_header Host $http_host; - proxy_pass http://backend:9000/api/; + proxy_set_header Host $http_host; + proxy_pass http://backend:9000/api/; } - - location /swagger/ { - proxy_set_header X-Forwarded-Protocol $scheme; - proxy_set_header Host $http_host; - proxy_pass http://backend:9000/swagger/; + location /admin/ { + proxy_set_header Host $http_host; + proxy_pass http://backend:9000/admin/; } - - location /redoc/ { - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Protocol $scheme; - proxy_pass http://backend:9000/redoc/; + location /media/ { + proxy_set_header Host $http_host; + alias /app/media/; } location / { - root /usr/share/nginx/html; - index index.html index.htm; - + alias /staticfiles/; + try_files $uri $uri/ /index.html; } -} - +} \ No newline at end of file diff --git a/proxy-server/nginx.conf b/proxy-server/nginx.conf deleted file mode 100644 index 8b078fc..0000000 --- a/proxy-server/nginx.conf +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen 80; - - location /media/ { - proxy_set_header Host $http_host; - root /var/html/; - } - - location /static/admin/ { - proxy_set_header Host $http_host; - root /var/html/; - } - - location /static/rest_framework/ { - proxy_set_header Host $http_host; - root /var/html/; - } - - location /static/drf-yasg/ { - proxy_set_header Host $http_host; - root /var/html/; - } - - location /admin/ { - proxy_set_header Host $http_host; - proxy_pass http://backend:9000/admin/; - } - - location /api/ { - proxy_set_header Host $http_host; - proxy_pass http://backend:9000/api/; - } - - location /swagger/ { - proxy_set_header X-Forwarded-Protocol $scheme; - proxy_set_header Host $http_host; - proxy_pass http://backend:9000/swagger/; - } - - location /redoc/ { - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Protocol $scheme; - proxy_pass http://backend:9000/redoc/; - } - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - - } -} -