From fd3d2affe754a37182fb19a029a93d8c6aaf2678 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sat, 15 Nov 2025 13:30:51 +0100 Subject: [PATCH] full refactor edu_master glance n8n nextcloud portainer traefik gitignore comments --- .gitignore | 28 +++++++++++++------ .../compose.yaml | 14 +++++----- .../compose.yaml | 4 +-- n8n-docker-compose.yaml => n8n/compose.yaml | 6 ++-- .../compose.yaml | 2 +- .../compose.yaml | 4 +-- .../compose.yaml | 8 +++--- 7 files changed, 39 insertions(+), 27 deletions(-) rename edu_master-docker-compose.yaml => edu_master/compose.yaml (95%) rename glance-docker-compose.yaml => glance/compose.yaml (85%) rename n8n-docker-compose.yaml => n8n/compose.yaml (88%) rename nextcloud-docker-compose.yaml => nextcloud/compose.yaml (99%) rename portainer-docker-compose.yaml => portainer/compose.yaml (89%) rename traefik-docker-compose.yaml => traefik/compose.yaml (93%) diff --git a/.gitignore b/.gitignore index fe934fb..e4c5b93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,27 @@ +# FreeFileSync sync.ffs_lock .sync.ffs_db -gitea/volumes/* -volumes/* -traefik/certs/* + +# Environment .env .env.anna .env.forust -traefik/letsencrypt/acme.json -dockmon/data/* -portainer_data/* + +# Volumes and data directories +gitea/gitea-db/* +gitea/gitea-data/* +n8n/n8n-data/* +n8n/n8n-node-data/* adguardhome/data/* -.python-version -gitea/gitea-data/ +dockmon/data/* +portainer/portainer_data/* + +# Traefik files +traefik/letsencrypt/acme.json traefik/logs/* +traefik/certs/* + +# Python +.python-version +.venv/ +venv/ diff --git a/edu_master-docker-compose.yaml b/edu_master/compose.yaml similarity index 95% rename from edu_master-docker-compose.yaml rename to edu_master/compose.yaml index 60eefbb..0aa1fbd 100644 --- a/edu_master-docker-compose.yaml +++ b/edu_master/compose.yaml @@ -1,6 +1,6 @@ x-app: &app build: - context: ./edu_master/backend/ + context: ./backend/ dockerfile: Dockerfile args: - VERSION=${VERSION:-v0.10.2} @@ -100,8 +100,8 @@ services: nginx: image: nginx:alpine volumes: - - ./edu_master/nginx/nginx.conf:/etc/nginx/conf.d/default.conf.template - - ./edu_master/nginx/entrypoint.sh:/entrypoint.sh + - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf.template + - ./nginx/entrypoint.sh:/entrypoint.sh environment: - MINIO_PRIVATE_BUCKET=${MINIO_PRIVATE_BUCKET:-private} - MINIO_PUBLIC_BUCKET=${MINIO_PUBLIC_BUCKET:-public} @@ -142,7 +142,7 @@ services: image: minio/minio:RELEASE.2024-11-07T00-52-20Z restart: unless-stopped volumes: - - ./volumes/edu_master/volumes/minio-data:/data + - ./volumes/minio-data:/data command: server /data --console-address ":9001" environment: - MINIO_BROWSER_REDIRECT_URL=${MINIO_BROWSER_REDIRECT_URL:-http://localhost/minio-console/} @@ -173,7 +173,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_DB=${POSTGRES_DB:-postgres} volumes: - - ./volumes/edu_master/volumes/postgres-db:/var/lib/postgresql/data + - ./volumes/postgres-db:/var/lib/postgresql/data healthcheck: test: [ "CMD-SHELL", "pg_isready" ] interval: 10s @@ -195,7 +195,7 @@ services: image: ollama/ollama:latest restart: unless-stopped volumes: - - ./volumes/edu_master/volumes/ollama-models:/root/.ollama + - ./volumes/ollama-models:/root/.ollama environment: - OLLAMA_DISABLE_TELEMETRY=true - OLLAMA_KEEP_ALIVE=5m @@ -235,7 +235,7 @@ services: phpsessid-bot: build: - context: edu_master/phpsessid_bot/ + context: ./phpsessid_bot/ dockerfile: Dockerfile restart: unless-stopped environment: diff --git a/glance-docker-compose.yaml b/glance/compose.yaml similarity index 85% rename from glance-docker-compose.yaml rename to glance/compose.yaml index 0058dbd..f393688 100644 --- a/glance-docker-compose.yaml +++ b/glance/compose.yaml @@ -4,8 +4,8 @@ services: image: glanceapp/glance restart: unless-stopped volumes: - - ./glance/config:/app/config - - ./glance/assets:/app/assets + - ./config:/app/config:ro + - ./assets:/app/assets:ro - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro env_file: .env diff --git a/n8n-docker-compose.yaml b/n8n/compose.yaml similarity index 88% rename from n8n-docker-compose.yaml rename to n8n/compose.yaml index a98dc0e..34aecbf 100644 --- a/n8n-docker-compose.yaml +++ b/n8n/compose.yaml @@ -13,8 +13,8 @@ services: - N8N_SECURE_COOKIE=false - N8N_COMMUNITY_PACKAGES_ALLOW_TOOL_USAGE=true volumes: - - ./volumes/n8n_data:/home/node/.n8n - - ./volumes/n8n_local-files:/files + - ./n8n-node-data:/home/node/.n8n + - ./n8n-files:/files extra_hosts: - "enterprise.n8n.io:104.26.13.187" - "enterprise.n8n.io:104.26.12.187" @@ -30,7 +30,7 @@ services: - "traefik.docker.network=traefik-proxy" - glance.name=n8n - glance.icon=si:n8n - - glance.url=https://n8n.${HOST}/ + - glance.url=https://n8n.forust.xyz/ - glance.description=n8n is a workflow automation tool that enables you to connect various apps and services to automate tasks and processes. networks: n8n: diff --git a/nextcloud-docker-compose.yaml b/nextcloud/compose.yaml similarity index 99% rename from nextcloud-docker-compose.yaml rename to nextcloud/compose.yaml index 82db9c7..5720363 100644 --- a/nextcloud-docker-compose.yaml +++ b/nextcloud/compose.yaml @@ -20,7 +20,7 @@ services: - "traefik.docker.network=traefik-proxy" - glance.name=Nextcloud # - glance.icon=si:nextcloud - - glance.url=https://nextcloud.${HOST}/ + - glance.url=https://nextcloud.forust.xyz/ - glance.description=Nextcloud is a suite of client-server software for creating and using file hosting services. diff --git a/portainer-docker-compose.yaml b/portainer/compose.yaml similarity index 89% rename from portainer-docker-compose.yaml rename to portainer/compose.yaml index c265488..aefd9d6 100644 --- a/portainer-docker-compose.yaml +++ b/portainer/compose.yaml @@ -5,7 +5,7 @@ services: restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock - - ./volumes/portainer_data:/data + - ./portainer_data:/data ports: - 9443:9443 # - 8000:8000 # Remove if you do not intend to use Edge Agents @@ -16,7 +16,7 @@ services: - "traefik.docker.network=traefik-proxy" - glance.name=Portainer # - glance.icon=si:portainer - - glance.url=https://portainer.${HOST}/ + - glance.url=https://portainer.forust.xyz/ - glance.description=Portainer is a lightweight management UI which allows you to easily manage your Docker environments. volumes: diff --git a/traefik-docker-compose.yaml b/traefik/compose.yaml similarity index 93% rename from traefik-docker-compose.yaml rename to traefik/compose.yaml index 9b99664..f30ff82 100644 --- a/traefik-docker-compose.yaml +++ b/traefik/compose.yaml @@ -44,7 +44,7 @@ services: - "traefik.enable=true" - "traefik.docker.network=traefik-proxy" - glance.name=Traefik - - glance.url=https://traefik.${HOST}/ + - glance.url=https://traefik.forust.xyz/ - glance.description=Traefik is a modern reverse proxy and load balancer ports: @@ -53,10 +53,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro + - ./dynamic:/etc/traefik/dynamic:ro + - ./certs:/certs:ro + - ./logs:/var/log/traefik # - ./traefik/letsencrypt:/letsencrypt - - ./traefik/dynamic:/etc/traefik/dynamic:ro - - ./traefik/logs:/var/log/traefik - - ./traefik/certs:/certs:ro networks: - traefik-proxy