fix: Update ports to avoid conflicts with existing Docker projects
- Change Gitea port from 3000 to 3001 - Change API port from 8080 to 8082 - Change Nginx port from 80 to 8083 - Add docker-compose.override.yml for local development - Add deployment guide for existing servers
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
version: '3.8'
|
||||
|
||||
# Nanaxe Server - Mindmap Synchronization
|
||||
# Run alongside other Docker projects by changing ports
|
||||
|
||||
services:
|
||||
# Gitea - Self-hosted Git server для хранения markdown-файлов
|
||||
gitea:
|
||||
@@ -14,9 +17,9 @@ services:
|
||||
- GITEA__database__USER=gitea
|
||||
- GITEA__database__PASSWD=gitea_password
|
||||
- GITEA__server__DOMAIN=${GITEA_DOMAIN:-localhost}
|
||||
- GITEA__server__ROOT_URL=http://${GITEA_DOMAIN:-localhost}:3000
|
||||
- GITEA__server__ROOT_URL=http://${GITEA_DOMAIN:-localhost}:3001
|
||||
- GITEA__server__SSH_DOMAIN=${GITEA_DOMAIN:-localhost}
|
||||
- GITEA__server__SSH_PORT=222
|
||||
- GITEA__server__SSH_PORT=2221
|
||||
- GITEA__server__SSH_LISTEN_PORT=22
|
||||
- GITEA__security__INSTALL_LOCK=true
|
||||
- GITEA__service__DISABLE_REGISTRATION=false
|
||||
@@ -29,8 +32,8 @@ services:
|
||||
- /etc/timezone:/etc/timezone:ro
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
ports:
|
||||
- "3000:3000"
|
||||
- "222:22"
|
||||
- "3001:3000" # Changed from 3000 to avoid conflicts
|
||||
- "2221:22" # Changed from 222 to avoid conflicts
|
||||
depends_on:
|
||||
- postgres
|
||||
|
||||
@@ -38,6 +41,8 @@ services:
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
container_name: nanaxe-postgres
|
||||
ports:
|
||||
- "5433:5432" # Expose on different port
|
||||
environment:
|
||||
- POSTGRES_USER=gitea
|
||||
- POSTGRES_PASSWORD=gitea_password
|
||||
@@ -68,7 +73,7 @@ services:
|
||||
- mindmap-data:/app/mindmaps
|
||||
- ./api/logs:/app/logs
|
||||
ports:
|
||||
- "8080:8080"
|
||||
- "8082:8080" # Changed from 8080 to avoid conflicts
|
||||
depends_on:
|
||||
- gitea
|
||||
- postgres
|
||||
@@ -84,8 +89,8 @@ services:
|
||||
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
- ./nginx/html:/usr/share/nginx/html:ro
|
||||
ports:
|
||||
- "80:80"
|
||||
- "443:443"
|
||||
- "8083:80" # Changed from 80 to avoid conflicts
|
||||
- "8444:443" # Changed from 443 to avoid conflicts
|
||||
depends_on:
|
||||
- gitea
|
||||
- nanaxe-api
|
||||
@@ -104,7 +109,7 @@ services:
|
||||
- USERNAME=${WEBDAV_USER:-admin}
|
||||
- PASSWORD=${WEBDAV_PASSWORD:-admin}
|
||||
ports:
|
||||
- "8081:80"
|
||||
- "8084:80" # Changed from 8081 to avoid conflicts
|
||||
|
||||
networks:
|
||||
nanaxe-network:
|
||||
|
||||
Reference in New Issue
Block a user