Merge branch 'main' of https://gitea.felixits.uz/Davron/firma_back

hello everyone

docker-compose.yml

@@ -27,15 +27,14 @@ services:
     build:
       context: .
       dockerfile: ./docker/Dockerfile.web
-    restart: always
     command: sh resources/scripts/entrypoint.sh
     environment:
       - PYTHONPYCACHEPREFIX=/var/cache/pycache
-
     volumes:
       - './:/code'
     depends_on:
       - db
+    restart: always
 
   db:
     image: postgres:16

portfolio_admin/settings.py

@@ -165,5 +165,6 @@ CSRF_TRUSTED_ORIGINS = [
     "https://serenmebel.uz",
     "https://www.serenmebel.uz",
     "https://api.serenmebel.uz",
+    "https://admin.promtechno.uz",
 ]
 

resources/layout/nginx.conf

@@ -27,7 +27,7 @@ http {
         server_name _;
 
         location / {
-            proxy_pass http://web:8001;
+            proxy_pass http://web:8000;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto https;