commit 0646075b85b20717b60d2adbe4ecf4a051ce696b Author: admin Date: Tue Aug 5 20:10:42 2025 +0300 initialize project structure with Docker, Nginx, and environment configuration diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..723ef36 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e216963 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "back"] + path = back + url = https://git.logidex.ru/fakz9/Crm-Backend +[submodule "front"] + path = front + url = https://git.logidex.ru/fakz9/Crm-Frontend diff --git a/back b/back new file mode 160000 index 0000000..4539302 --- /dev/null +++ b/back @@ -0,0 +1 @@ +Subproject commit 453930251bf5980b6a07e9f8399ed67eb6e7d77c diff --git a/config/back/.env b/config/back/.env new file mode 100644 index 0000000..c6b65e9 --- /dev/null +++ b/config/back/.env @@ -0,0 +1,7 @@ +PG_LOGIN= +PG_PASSWORD= +PG_PORT= +PG_DATABASE= +PG_HOST= + +SECRET_KEY= diff --git a/config/front/.env b/config/front/.env new file mode 100644 index 0000000..e69de29 diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf new file mode 100644 index 0000000..a1dacf6 --- /dev/null +++ b/config/nginx/nginx.conf @@ -0,0 +1,38 @@ +upstream backned { + server unix:/app/run/socket.sock; +} + +upstream frontend { + server front:3000; +} + + +server { + listen 80; + server_name crm.logidex.ru; + + location /api { + proxy_pass http://backned; + + proxy_set_header Host $http_host; + 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 $scheme; + } + + location / { + proxy_pass http://frontend; + proxy_set_header Host $http_host; + 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 $scheme; + } + + location /_next/webpack-hmr { + proxy_pass http://frontend; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + } +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..fa2900c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,44 @@ +services: + back: + image: git.logidex.ru/fakz9/crm-backend:latest + volumes: + - type: volume + source: app_run + target: /app/run + read_only: false + env_file: + - config/back/.env + restart: unless-stopped + front: + image: git.logidex.ru/fakz9/crm-frontend:latest + depends_on: + - back + env_file: + - config/front/.env + networks: + - appnet + restart: unless-stopped + nginx: + image: nginx:latest + ports: + - "80:80" + - "443:443" + depends_on: + - back + volumes: + - type: bind + source: ./config/nginx/nginx.conf + target: /etc/nginx/conf.d/default.conf + read_only: true + - type: volume + source: app_run + target: /app/run + read_only: false + restart: unless-stopped + networks: + - appnet +volumes: + app_run: + driver: local +networks: + appnet: \ No newline at end of file diff --git a/front b/front new file mode 160000 index 0000000..cd034bc --- /dev/null +++ b/front @@ -0,0 +1 @@ +Subproject commit cd034bcce652ded9df9a71860b8b0b8dc9c99d69