forust/homelab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Wiki Activity

Refactor Docker Compose files for n8n and Portainer: update volume paths and network configurations; remove deprecated n8n configuration file.

Browse Source
This commit is contained in:
mr-forust
2025-11-13 03:38:48 +01:00
parent 2423223b39
commit 75874a2ff3
4 changed files with 42 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
edu_master-docker-compose.yaml
+32 -54
View File
@@ -87,6 +87,7 @@ x-app: &app
networks:
- traefik-proxy
- default
- n8n
x-frontend: &frontend
image: watercrawl/frontend:${VERSION:-v0.10.2}
@@ -112,7 +113,8 @@ services:
restart: unless-stopped
networks:
- traefik-proxy
- default
- n8n
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik-proxy"
@@ -140,7 +142,7 @@ services:
image: minio/minio:RELEASE.2024-11-07T00-52-20Z
restart: unless-stopped
volumes:
- ./edu_master/volumes/minio-data:/data
- ./volumes/edu_master/volumes/minio-data:/data
command: server /data --console-address ":9001"
environment:
- MINIO_BROWSER_REDIRECT_URL=${MINIO_BROWSER_REDIRECT_URL:-http://localhost/minio-console/}
@@ -161,7 +163,7 @@ services:
- 1.1.1.1
networks:
- traefik-proxy
- default
- n8n
db:
image: postgres:17.2-alpine3.21
@@ -171,7 +173,7 @@ services:
- POSTGRES_USER=${POSTGRES_USER:-postgres}
- POSTGRES_DB=${POSTGRES_DB:-postgres}
volumes:
- ./edu_master/volumes/postgres-db:/var/lib/postgresql/data
- ./volumes/edu_master/volumes/postgres-db:/var/lib/postgresql/data
healthcheck:
test: [ "CMD-SHELL", "pg_isready" ]
interval: 10s
@@ -182,6 +184,8 @@ services:
image: watercrawl/mcp:v1.2.0
restart: unless-stopped
command: [ "sse", "--base-url", "http://app:9000", '--port', '3000', '--endpoint', '/sse' ]
networks:
- n8n
redis:
image: redis:latest
@@ -191,7 +195,7 @@ services:
image: ollama/ollama:latest
restart: unless-stopped
volumes:
- ./edu_master/volumes/ollama-models:/root/.ollama
- ./volumes/edu_master/volumes/ollama-models:/root/.ollama
environment:
- OLLAMA_DISABLE_TELEMETRY=true
- OLLAMA_KEEP_ALIVE=5m
@@ -201,59 +205,33 @@ services:
dns:
- 1.1.1.1
- 8.8.8.8
n8n:
image: docker.n8n.io/n8nio/n8n
restart: unless-stopped
environment:
- N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
- N8N_PORT=5678
- N8N_RUNNERS_ENABLED=true
- NODE_ENV=production
- GENERIC_TIMEZONE=Europe/Bratislava
- TZ=Europe/Bratislava
- N8N_SECURE_COOKIE=false
- N8N_COMMUNITY_PACKAGES_ALLOW_TOOL_USAGE=true
volumes:
- n8n_data:/home/node/.n8n
- ./edu_master/n8n/local-files:/files
extra_hosts:
- "enterprise.n8n.io:104.26.13.187"
- "enterprise.n8n.io:104.26.12.187"
- "enterprise.n8n.io:172.67.68.102"
dns:
- 1.1.1.1
- 8.8.8.8
networks:
- traefik-proxy
- default
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik-proxy"
- n8n
# docker exec -it edu_master-llm-1 ollama pull neural-chat:7b-q4
# docker exec -it edu_master-llm-1 ollama pull mistral:7b-q4
lessons-bot:
build:
context: edu_master/lessons_bot/
dockerfile: Dockerfile
restart: unless-stopped
environment:
- LESSONS_BOT_TOKEN=${LESSONS_BOT_TOKEN}
- N8N_WEBHOOK_URL=${N8N_WEBHOOK_URL:-http://n8n:5678/webhook-test/get-lessons}
- N8N_SECRET=${N8N_SECRET:-your-secret-token-here}
- WATERCRAWL_API_URL=${WATERCRAWL_API_URL:-http://app:9000/api}
- PHPSESSID_BOT_URL=${PHPSESSID_BOT_URL:-http://phpsessid-bot:5000}
- EDU_HOST=${EDU_HOST:-edu.edu.vn.ua}
depends_on:
- n8n
- app
- phpsessid-bot
dns:
- 1.1.1.1
- 8.8.8.8
networks:
- default
# lessons-bot:
# build:
# context: edu_master/lessons_bot/
# dockerfile: Dockerfile
# restart: unless-stopped
# environment:
# - LESSONS_BOT_TOKEN=${LESSONS_BOT_TOKEN}
# - N8N_WEBHOOK_URL=${N8N_WEBHOOK_URL:-http://n8n:5678/webhook-test/get-lessons}
# - N8N_SECRET=${N8N_SECRET:-your-secret-token-here}
# - WATERCRAWL_API_URL=${WATERCRAWL_API_URL:-http://app:9000/api}
# - PHPSESSID_BOT_URL=${PHPSESSID_BOT_URL:-http://phpsessid-bot:5000}
# - EDU_HOST=${EDU_HOST:-edu.edu.vn.ua}
# depends_on:
# - n8n
# - app
# - phpsessid-bot
# dns:
# - 1.1.1.1
# - 8.8.8.8
# networks:
# - default
phpsessid-bot:
build: