From 14d2807c4cf824f5b2c034388fd8ebb453cda92a Mon Sep 17 00:00:00 2001 From: xoliqberdiyev Date: Thu, 25 Dec 2025 09:36:58 +0000 Subject: [PATCH 1/4] Update docker-compose.yml --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 89dd80b..23e6290 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,18 +24,18 @@ services: web: networks: - portfolio - build: + build: context: . dockerfile: ./docker/Dockerfile.web - restart: always command: sh resources/scripts/entrypoint.sh environment: - PYTHONPYCACHEPREFIX=/var/cache/pycache - volumes: - './:/code' depends_on: - db + - redis + restart: always db: image: postgres:16 From 5c990f1e32ce236f3ecf9c349dbd405de957134a Mon Sep 17 00:00:00 2001 From: xoliqberdiyev Date: Thu, 25 Dec 2025 09:39:18 +0000 Subject: [PATCH 2/4] Update docker-compose.yml --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 23e6290..0e943b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,6 @@ services: - './:/code' depends_on: - db - - redis restart: always db: From f8517264b78f33434c33202c79e7d103de74fc4a Mon Sep 17 00:00:00 2001 From: xoliqberdiyev Date: Thu, 25 Dec 2025 10:27:40 +0000 Subject: [PATCH 3/4] Update resources/layout/nginx.conf --- resources/layout/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/layout/nginx.conf b/resources/layout/nginx.conf index acdc82e..e10373b 100644 --- a/resources/layout/nginx.conf +++ b/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; From 6164af29416cd2137272350dde7e0f8ee7fb2631 Mon Sep 17 00:00:00 2001 From: xoliqberdiyev Date: Thu, 25 Dec 2025 10:28:53 +0000 Subject: [PATCH 4/4] Update portfolio_admin/settings.py --- portfolio_admin/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/portfolio_admin/settings.py b/portfolio_admin/settings.py index ee2f145..a6bfab8 100644 --- a/portfolio_admin/settings.py +++ b/portfolio_admin/settings.py @@ -164,5 +164,6 @@ CSRF_TRUSTED_ORIGINS = [ "https://serenmebel.uz", "https://www.serenmebel.uz", "https://api.serenmebel.uz", + "https://admin.promtechno.uz", ]